public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeWrapper: delete --set-eval

Browse Source 
because --run is good enough.
This commit is contained in:
Orivej Desh 2017-11-17 12:53:54 +00:00
parent 74648f7466
commit fbdc74c761
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -53,11 +53,6 @@ makeWrapper() {
value="${params[$((n + 2))]}" value="${params[$((n + 2))]}"
n=$((n + 2)) n=$((n + 2))
echo "export $varName=\${$varName-${value@Q}}" >> "$wrapper" 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 elif [[ "$p" == "--unset" ]]; then
varName="${params[$((n + 1))]}" varName="${params[$((n + 1))]}"
n=$((n + 1)) n=$((n + 1))

2
pkgs/misc/emulators/retrofe/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/retrofe" \ wrapProgram "$out/bin/retrofe" \
--prefix GST_PLUGIN_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --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; { meta = with stdenv.lib; {

2
pkgs/tools/text/popfile/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
wrapProgram "$path" \ wrapProgram "$path" \
--prefix PERL5LIB : $PERL5LIB:$out/bin \ --prefix PERL5LIB : $PERL5LIB:$out/bin \
--set POPFILE_ROOT $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"' --run 'test -d "$POPFILE_USER" || mkdir -m 0700 -p "$POPFILE_USER"'
done done
''; '';