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

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

View File

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