public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cygwin: rebase fixes

Browse Source 
- use fixupOutputsHook to find libs in all outputs
- don't rebase symlinks
This commit is contained in:
David McFarland 2017-05-23 10:35:23 -03:00
parent 3584707638
commit cdc5cf52c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/cygwin/rebase-i686.sh
View File

@ -1,10 +1,10 @@
postFixupHooks+=(_cygwinFixAutoImageBase) fixupOutputHooks+=(_cygwinFixAutoImageBase)
_cygwinFixAutoImageBase() { _cygwinFixAutoImageBase() {
if [ "$dontRebase" == 1 ]; then if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
return return
fi 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 if [ -f /etc/rebasenix.nextbase ]; then
NEXTBASE="$(</etc/rebasenix.nextbase)" NEXTBASE="$(</etc/rebasenix.nextbase)"
fi fi

6
pkgs/stdenv/cygwin/rebase-x86_64.sh
View File

@ -1,10 +1,10 @@
postFixupHooks+=(_cygwinFixAutoImageBase) fixupOutputHooks+=(_cygwinFixAutoImageBase)
_cygwinFixAutoImageBase() { _cygwinFixAutoImageBase() {
if [ "$dontRebase" == 1 ]; then if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
return return
fi 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 if [ -f /etc/rebasenix.nextbase ]; then
NEXTBASE="$(</etc/rebasenix.nextbase)" NEXTBASE="$(</etc/rebasenix.nextbase)"
fi fi