environment: clear up activationScript creation

This commit is contained in:
Cornelius Mika 2017-09-06 10:17:29 +02:00
parent f3fa3ce957
commit 1720b361ca

View file

@ -389,7 +389,7 @@ in
abort ("Dependency cycle in activation script: " abort ("Dependency cycle in activation script: "
+ builtins.toJSON sortedCommands); + builtins.toJSON sortedCommands);
sf = pkgs.writeText "activation-script" '' activationScript = pkgs.writeScript "activation-script" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
set -eu set -eu
@ -434,7 +434,7 @@ in
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
install -D -m755 ${sf} $out/activate install -D ${activationScript} $out/activate
substituteInPlace $out/activate \ substituteInPlace $out/activate \
--subst-var-by GENERATION_DIR $out --subst-var-by GENERATION_DIR $out