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

Revert "st: copy config file in 'prePatch' instead of 'preBuild'"

Browse Source 
Also change the custom config generation to the postPatch phase.
This commit is contained in:
Alvar 2020-04-22 13:37:42 +00:00 committed by geistesk
parent 81902419dd
commit 50b213a45e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/st/default.nix
View File

@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
inherit patches; inherit patches;
prePatch = optionalString (conf != null) '' configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
cp ${writeText "config.def.h" conf} config.def.h postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h";
'';
nativeBuildInputs = [ pkgconfig ncurses ]; nativeBuildInputs = [ pkgconfig ncurses ];
buildInputs = [ libX11 libXft ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ extraLibs;