diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 12:53:54 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 12:53:54 +0000 |
| commit | fbdc74c761ef4bbd9ccc3688924932e0af49f7f9 (patch) | |
| tree | ab329e685d58953cede5e06a29edd8d2986a58c0 | |
| parent | 74648f74662080a11e7d80511b4487989c6084c0 (diff) | |
| download | nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar.gz nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar.bz2 nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar.lz nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar.xz nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.tar.zst nixpkgs-fbdc74c761ef4bbd9ccc3688924932e0af49f7f9.zip | |
makeWrapper: delete --set-eval
because --run is good enough.
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-wrapper.sh | 5 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retrofe/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/popfile/default.nix | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index ab24fb38b29..f75b285bacf 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -53,11 +53,6 @@ makeWrapper() { value="${params[$((n + 2))]}" n=$((n + 2)) echo "export $varName=\${$varName-${value@Q}}" >> "$wrapper" - elif [[ "$p" == "--set-eval" ]]; then - varName="${params[$((n + 1))]}" - value="${params[$((n + 2))]}" - n=$((n + 2)) - echo "export $varName=\$(eval echo ${value@Q})" >> "$wrapper" elif [[ "$p" == "--unset" ]]; then varName="${params[$((n + 1))]}" n=$((n + 1)) diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 26ef9907f89..ffc494dad4c 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/retrofe" \ --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --set-eval RETROFE_PATH '$''\{RETROFE_PATH:-$PWD}' + --run 'export RETROFE_PATH=''${RETROFE_PATH:-$PWD}' ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 37ad72813f6..42befa2ce26 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { wrapProgram "$path" \ --prefix PERL5LIB : $PERL5LIB:$out/bin \ --set POPFILE_ROOT $out/bin \ - --set-eval POPFILE_USER '$''\{POPFILE_USER:-$HOME/.popfile}' \ + --run 'export POPFILE_USER=''${POPFILE_USER:-$HOME/.popfile}' \ --run 'test -d "$POPFILE_USER" || mkdir -m 0700 -p "$POPFILE_USER"' done ''; |