pyrox.dev
cygwin: rebase fixes
- use fixupOutputsHook to find libs in all outputs
- don't rebase symlinks
+3
-3
pkgs/stdenv/cygwin/rebase-i686.sh
+3
-3
pkgs/stdenv/cygwin/rebase-i686.sh
···
1
-
postFixupHooks+=(_cygwinFixAutoImageBase)
1
+
fixupOutputHooks+=(_cygwinFixAutoImageBase)
2
2
3
3
_cygwinFixAutoImageBase() {
4
-
if [ "$dontRebase" == 1 ]; then
4
+
if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
5
5
return
6
6
fi
7
-
find $out -name "*.dll" | while read DLL; do
7
+
find "$prefix" -name "*.dll" -type f | while read DLL; do
8
8
if [ -f /etc/rebasenix.nextbase ]; then
9
9
NEXTBASE="$(</etc/rebasenix.nextbase)"
10
10
fi
+3
-3
pkgs/stdenv/cygwin/rebase-x86_64.sh
+3
-3
pkgs/stdenv/cygwin/rebase-x86_64.sh
···
1
-
postFixupHooks+=(_cygwinFixAutoImageBase)
1
+
fixupOutputHooks+=(_cygwinFixAutoImageBase)
2
2
3
3
_cygwinFixAutoImageBase() {
4
-
if [ "$dontRebase" == 1 ]; then
4
+
if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
5
5
return
6
6
fi
7
-
find $out -name "*.dll" | while read DLL; do
7
+
find "$prefix" -name "*.dll" -type f | while read DLL; do
8
8
if [ -f /etc/rebasenix.nextbase ]; then
9
9
NEXTBASE="$(</etc/rebasenix.nextbase)"
10
10
fi