From 50b213a45e819d7f04d574789db34d1c0ebe2b65 Mon Sep 17 00:00:00 2001 From: Alvar Date: Wed, 22 Apr 2020 13:37:42 +0000 Subject: [PATCH] Revert "st: copy config file in 'prePatch' instead of 'preBuild'" Also change the custom config generation to the postPatch phase. --- pkgs/applications/misc/st/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 33924bdb7be..bb3c57a5990 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -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;