Merge pull request #85775 from geistesk/revert-85443-st

This commit is contained in:
Jörg Thalheim 2020-04-29 15:00:41 +01:00 committed by GitHub
commit e0cf3f886e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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;