alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

plasma53.plasma-workspace: patch startkde paths correctly

Browse source
This commit is contained in:
Thomas Tuegel 2015-06-19 10:15:23 -05:00
parent 5560585d4c
commit e5e32e45a5
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/desktops/plasma-5.3/default.nix
View file

@ -206,24 +206,17 @@ let
}; };
plasma-workspace = extendDerivation super.plasma-workspace { plasma-workspace = extendDerivation super.plasma-workspace {
patches = [ patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
(scope.substituteAll {
src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
inherit (scope) bash gnused gnugrep socat;
inherit (scope) kconfig kinit kservice;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
qt5tools = scope.qt5tools;
dbus_tools = scope.dbus.tools;
})
];
buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
inherit (scope) bash gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools;
postPatch = '' postPatch = ''
substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
--replace kdostartupconfig5 $out/bin/kdostartupconfig5 --replace kdostartupconfig5 $out/bin/kdostartupconfig5
''; substituteAllInPlace startkde/startkde.cmake
preConfigure = ''
substituteInPlace startkde/startkde.cmake \
--subst-var-by plasmaWorkspace "$out"
''; '';
}; };