From fbdc74c761ef4bbd9ccc3688924932e0af49f7f9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 17 Nov 2017 12:53:54 +0000
Subject: makeWrapper: delete --set-eval

because --run is good enough.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 5 -----
 pkgs/misc/emulators/retrofe/default.nix        | 2 +-
 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
   '';
-- 
cgit 1.4.1