Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 703827f36cc6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b8574540b86
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 5, 2018

  1. stdenv/darwin: fix portable libsystem hook 

    Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.
    @matthewbauer
    matthewbauer committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b85745 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/stdenv/darwin/portable-libsystem.sh
6 changes: 4 additions & 2 deletions pkgs/stdenv/darwin/portable-libsystem.sh
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@
fixupOutputHooks+=('fixLibsystemRefs $prefix')

fixLibsystemRefs() {
find "$1/bin" \
-exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
if [ -d "$1/bin" ]; then
find "$1/bin" -exec \
install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
fi
}