diff options
| author | Andreas <hamburger1984@gmail.com> | 2022-05-20 18:12:59 +0200 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-06-15 14:53:40 +0800 |
| commit | 6cae76a505f7a0a5bd536ad4c54771aa77d9f0a2 (patch) | |
| tree | 75052e92e0fd6e2f0908b48ead139a260161037b /pkgs/desktops | |
| parent | 72c3b6c05e27f51b89294e13cf3d1ef76a86e7c9 (diff) | |
kwayland-server has been integrated into kwin - delete package
Diffstat (limited to 'pkgs/desktops')
3 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 87f89330afe0d..41cdc298e9875 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -124,7 +124,6 @@ let ksystemstats = callPackage ./ksystemstats.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; - kwayland-server = callPackage ./kwayland-server {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; layer-shell-qt = callPackage ./layer-shell-qt.nix {}; diff --git a/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch deleted file mode 100644 index 771e093bb9e88..0000000000000 --- a/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001 -From: Tom Hall <tahall256@protonmail.ch> -Date: Sat, 29 Aug 2020 19:14:30 +0100 -Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets - ---- - src/server/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt -index 0f99682..35e3601 100644 ---- a/src/server/CMakeLists.txt -+++ b/src/server/CMakeLists.txt -@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI - SOVERSION ${KWAYLANDSERVER_SOVERSION} - ) - --install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - - set(SERVER_LIB_HEADERS - ${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h --- -2.26.2 - diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix deleted file mode 100644 index e71b98b1b9468..0000000000000 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - mkDerivation, lib, cmake, - extra-cmake-modules, kdoctools, - kwayland, plasma-wayland-protocols, - wayland, wayland-protocols, qtbase -}: - -mkDerivation { - pname = "kwayland-server"; - nativeBuildInputs = [ - cmake - extra-cmake-modules #kdoctools - ]; - buildInputs = [ - kwayland plasma-wayland-protocols wayland wayland-protocols - ]; - patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; -} |