cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

kwayland-server has been integrated into kwin - delete package

Browse source
This commit is contained in:
Andreas 2022-05-20 18:12:59 +02:00 committed by Peter Hoeg
parent 72c3b6c05e
commit 6cae76a505
3 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/desktops/plasma-5/default.nix
View file

@ -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 {};

25
pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
View file

@ -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

18
pkgs/desktops/plasma-5/kwayland-server/default.nix
View file

@ -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 ];
}