diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 10:15:52 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 12:28:14 +0000 |
| commit | 74648f74662080a11e7d80511b4487989c6084c0 (patch) | |
| tree | c91de34251a6a97041e00ace824206064350c81f | |
| parent | 80d1eaa01de9d02e73a99aac15b9be1908839c6a (diff) | |
| download | nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar.gz nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar.bz2 nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar.lz nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar.xz nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.tar.zst nixpkgs-74648f74662080a11e7d80511b4487989c6084c0.zip | |
treewide: use --set-default and --set-eval where appropriate
| -rw-r--r-- | pkgs/development/compilers/dmd/2.067.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/dmd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/retrofe/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/popfile/default.nix | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 6a3cddbd2e5..29a8618dc7b 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -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 diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 938dd04904b..ff19a5b872c 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -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 diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 5f921c5a923..26ef9907f89 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 RETROFE_PATH "\''${RETROFE_PATH:-\$PWD}" + --set-eval RETROFE_PATH '$''\{RETROFE_PATH:-$PWD}' ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 6b15c165dfd..4f9b3a6b443 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -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 ''; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 10b82342051..37ad72813f6 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -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 ''; |