JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34431 from LnL7/darwin-json-glib

Browse Source 
json-glib: fixup darwin install_name
This commit is contained in:
Daiderd Jordan 2018-02-02 00:25:37 +01:00 committed by GitHub
commit a64f8e888f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/json-glib/default.nix
View File

@ -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";