summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-10-31 16:50:15 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-01 14:44:44 -0400
commit2811b032d639684d3983282e9d10d89f37d161d5 (patch)
tree8354d496dc4207144775f458d81c3b1224014b43 /pkgs/stdenv
parent1290e532eac8f8a1815c0aedee94796509e04e3d (diff)
downloadnixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.gz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.bz2
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.lz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.xz
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.tar.zst
nixpkgs-2811b032d639684d3983282e9d10d89f37d161d5.zip
treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/cygwin/rebase-i686.sh2
-rw-r--r--pkgs/stdenv/cygwin/rebase-x86_64.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh
index 091c9044d93..6b8ec441ca7 100644
--- a/pkgs/stdenv/cygwin/rebase-i686.sh
+++ b/pkgs/stdenv/cygwin/rebase-i686.sh
@@ -1,7 +1,7 @@
 fixupOutputHooks+=(_cygwinFixAutoImageBase)
 
 _cygwinFixAutoImageBase() {
-    if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
+    if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then
         return
     fi
     find "$prefix" -name "*.dll" -type f | while read DLL; do
diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh
index 4c8f8ebd7eb..6dccdc40c72 100644
--- a/pkgs/stdenv/cygwin/rebase-x86_64.sh
+++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh
@@ -1,7 +1,7 @@
 fixupOutputHooks+=(_cygwinFixAutoImageBase)
 
 _cygwinFixAutoImageBase() {
-    if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
+    if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then
         return
     fi
     find "$prefix" -name "*.dll" -type f | while read DLL; do