MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

kwin: fixup build with cmake-3.10 via upstream patch

Browse source
This commit is contained in:
Vladimír Čunát 2018-01-28 17:54:51 +01:00
parent 800e744869
commit ac3b8fe91a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, copyPathsToStore, mkDerivation, lib, copyPathsToStore, fetchpatch,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
@ -29,7 +29,14 @@ mkDerivation {
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
]; ];
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series)
++ [(fetchpatch {
name = "cmake-3.10.diff";
# included upstream for kwin >= 5.11.95
url = "https://github.com/KDE/kwin/commit/cd544890ced4192.diff";
sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5";
})]
;
CXXFLAGS = [ CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
]; ];