diff options
-rw-r--r-- | pkgs/stdenv/cygwin/rebase-i686.sh | 6 | ||||
-rw-r--r-- | pkgs/stdenv/cygwin/rebase-x86_64.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh index e97dc66c0ad6..091c9044d93f 100644 --- a/pkgs/stdenv/cygwin/rebase-i686.sh +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -1,10 +1,10 @@ -postFixupHooks+=(_cygwinFixAutoImageBase) +fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { - if [ "$dontRebase" == 1 ]; then + if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then return fi - find $out -name "*.dll" | while read DLL; do + find "$prefix" -name "*.dll" -type f | while read DLL; do if [ -f /etc/rebasenix.nextbase ]; then NEXTBASE="$(</etc/rebasenix.nextbase)" fi diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh index a79c62574606..77adc52d53b6 100644 --- a/pkgs/stdenv/cygwin/rebase-x86_64.sh +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -1,10 +1,10 @@ -postFixupHooks+=(_cygwinFixAutoImageBase) +fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { - if [ "$dontRebase" == 1 ]; then + if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then return fi - find $out -name "*.dll" | while read DLL; do + find "$prefix" -name "*.dll" -type f | while read DLL; do if [ -f /etc/rebasenix.nextbase ]; then NEXTBASE="$(</etc/rebasenix.nextbase)" fi |