diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-02 00:25:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 00:25:37 +0100 |
| commit | a64f8e888ff8efb250aac65cf77aac253220f62b (patch) | |
| tree | cf360ecc599385f3e5532ca94a3e9cab5f17afe0 /pkgs | |
| parent | d2e518c4c57cd985a4965e560d72e45a6ff1fa49 (diff) | |
| parent | 787d371c2857121a6dabaee7ec1318d44898e8ac (diff) | |
| download | nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar.gz nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar.bz2 nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar.lz nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar.xz nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.tar.zst nixlib-a64f8e888ff8efb250aac65cf77aac253220f62b.zip | |
Merge pull request #34431 from LnL7/darwin-json-glib
json-glib: fixup darwin install_name
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/json-glib/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 73fa1f311bff..bf32f4f8e8bc 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext +, gobjectIntrospection, dbus, libintlOrEmpty +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { name = "json-glib-${minVer}.2"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty; + buildInputs = libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; |