From 50f46e060f88df6b1f73d80862eacaa3daa89a08 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 28 May 2018 20:21:45 +0200 Subject: gdk-pixbuf: fixup library install_names on darwin Meson tries to use rpaths but we don't use those in the darwin stdenv. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f1e73a77bea7..d14e625d4365 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 gtk-doc gobjectIntrospection makeWrapper - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; -- cgit 1.4.1