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: 7cadf50be205
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bb08e881dd4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 29, 2018

  1. gdk-pixbuf: patch library rpath references on darwin 

    A bunch of the libraries like libpixbufloader-png link against libgdk_pixbuf,
however the install_name is not correct at this point yet since meson tries to use rpaths.
    @LnL7
    LnL7 committed May 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samsonasik Abdul Malik Ikhsan
    GPG key ID: 69AC5BC354C89BE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6bb08e8 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/development/libraries/gdk-pixbuf/default.nix
8 changes: 6 additions & 2 deletions pkgs/development/libraries/gdk-pixbuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,10 +82,14 @@ stdenv.mkDerivation rec {
$dev/bin/gdk-pixbuf-query-loaders --update-cache
'';

# The fixDarwinDylibNames hook doesn't patch binaries.
# The fixDarwinDylibNames hook doesn't patch library references or binaries.
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
for f in $(find $out/lib -name '*.dylib'); do
install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
done
for f in $out/bin/* $dev/bin/*; do
install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f
install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
done
'';