diff options
| author | David McFarland <corngood@gmail.com> | 2017-05-23 10:35:23 -0300 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2017-06-26 09:26:10 -0300 |
| commit | cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a (patch) | |
| tree | bc6c2da495baed36f1fc7d5b725b3fcc7459d958 /pkgs/stdenv/cygwin/rebase-i686.sh | |
| parent | 358470763822d490fb36f8e5e3eca6f1e4c8378f (diff) | |
| download | nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar.gz nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar.bz2 nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar.lz nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar.xz nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.tar.zst nixpkgs-cdc5cf52c1e1a18e62bbd85ca404492e9bd3023a.zip | |
cygwin: rebase fixes
- use fixupOutputsHook to find libs in all outputs - don't rebase symlinks
Diffstat (limited to 'pkgs/stdenv/cygwin/rebase-i686.sh')
| -rw-r--r-- | pkgs/stdenv/cygwin/rebase-i686.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh index e97dc66c0ad..091c9044d93 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 |