makeWrapper: delete --set-eval

because --run is good enough.

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))

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; {

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
   '';