public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plasma53.plasma-desktop: fix missing paths

Browse Source
This commit is contained in:
Thomas Tuegel 2015-06-19 10:14:48 -05:00
parent 8862d8d9c9
commit 5560585d4c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/plasma-5.3/default.nix
View File

@ -183,17 +183,26 @@ let
[ canberra ] [ canberra ]
++ (with xlibs; [ libxkbfile libXcursor libXft ]); ++ (with xlibs; [ libxkbfile libXcursor libXft ]);
patches = [ patches = [
./plasma-desktop/plasma-desktop-hwclock.patch (scope.substituteAll {
src = ./plasma-desktop/plasma-desktop-hwclock.patch;
hwclock = "${scope.utillinux}/sbin/hwclock";
})
./plasma-desktop/plasma-desktop-zoneinfo.patch ./plasma-desktop/plasma-desktop-zoneinfo.patch
(scope.substituteAll { (scope.substituteAll {
src = ./plasma-desktop/plasma-desktop-xkb-rules.patch; src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
xkb = scope.xkeyboard_config; xkb = scope.xkeyboard_config;
}) })
]; ];
preConfigure = '' NIX_CFLAGS_COMPILE = with scope.xlibs;
substituteInPlace kcms/dateandtime/helper.cpp \ lib.concatStringsSep " " [
--subst-var-by hwclock "${scope.utillinux}/sbin/hwclock" "-I${xf86inputsynaptics}/include/xorg"
''; "-I${xf86inputevdev}/include/xorg"
"-I${xorgserver}/include/xorg"
];
cmakeFlags = with scope.xlibs; [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
];
}; };
plasma-workspace = extendDerivation super.plasma-workspace { plasma-workspace = extendDerivation super.plasma-workspace {