Commit c696fcda authored by Andrew Childs's avatar Andrew Childs
Browse files

fixDarwinDylibNames: set name of install_name_tool

parent 9fb89243

pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ fixDarwinDylibNames() { 
    for fn in "$@"; do

        if [ -L "$fn" ]; then continue; fi

        echo "$fn: fixing dylib"

        int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)

        int_out=$(@targetPrefix@install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)

        result=$?

        if [ "$result" -ne 0 ] &&

            ! grep "shared library stub file and can't be changed" <<< "$out"

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -641,7 +641,9 @@ in 














  setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;



























  fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;













  fixDarwinDylibNames = makeSetupHook {













    substitutions = { inherit (binutils) targetPrefix; };













  } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;





























  keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;