b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
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 \
--prefix PATH ":" "${stdenv.cc}/bin" \
--set CC "$""{CC:-$CC""}"
--set-default CC "$CC"
cd $out/bin
tee dmd.conf << EOF

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

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

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

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

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

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

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

@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
wrapProgram "$path" \
--prefix PERL5LIB : $PERL5LIB:$out/bin \
--set POPFILE_ROOT $out/bin \
--set POPFILE_USER \$\{POPFILE_USER:-\$HOME/.popfile\} \
--run "test -d \$POPFILE_USER || mkdir -m 0700 -p \$POPFILE_USER"
--set-eval POPFILE_USER '$''\{POPFILE_USER:-$HOME/.popfile}' \
--run 'test -d "$POPFILE_USER" || mkdir -m 0700 -p "$POPFILE_USER"'
done
'';