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

treewide: use --set-default and --set-eval where appropriate

This commit is contained in:
Orivej Desh 2017-11-17 10:15:52 +00:00
parent 80d1eaa01d
commit 74648f7466
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/dmd/2.067.1.nix
View File

@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/dmd \ wrapProgram $out/bin/dmd \
--prefix PATH ":" "${stdenv.cc}/bin" \ --prefix PATH ":" "${stdenv.cc}/bin" \
--set CC "$""{CC:-$CC""}" --set-default CC "$CC"
cd $out/bin cd $out/bin
tee dmd.conf << EOF tee dmd.conf << EOF

2
pkgs/development/compilers/dmd/default.nix
View File

@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/dmd \ wrapProgram $out/bin/dmd \
--prefix PATH ":" "${stdenv.cc}/bin" \ --prefix PATH ":" "${stdenv.cc}/bin" \
--set CC "$""{CC:-$CC""}" --set-default CC "$CC"
cd $out/bin cd $out/bin
tee dmd.conf << EOF tee dmd.conf << EOF

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 RETROFE_PATH "\''${RETROFE_PATH:-\$PWD}" --set-eval RETROFE_PATH '$''\{RETROFE_PATH:-$PWD}'
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/servers/nosql/apache-jena/fuseki-binary.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
for i in "$out"/bin/*; do for i in "$out"/bin/*; do
wrapProgram "$i" \ wrapProgram "$i" \
--prefix "PATH" : "${java}/bin/" \ --prefix "PATH" : "${java}/bin/" \
--set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \ --set-default "FUSEKI_HOME" "$out" \
; ;
done done
''; '';

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

@ -44,8 +44,8 @@ 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 POPFILE_USER \$\{POPFILE_USER:-\$HOME/.popfile\} \ --set-eval 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
''; '';