Merge pull request #34431 from LnL7/darwin-json-glib
json-glib: fixup darwin install_name
This commit is contained in:
commit
a64f8e888f
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "json-glib-${minVer}.2";
|
name = "json-glib-${minVer}.2";
|
||||||
|
@ -11,7 +14,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [ glib ];
|
propagatedBuildInputs = [ glib ];
|
||||||
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
|
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
|
||||||
buildInputs = libintlOrEmpty;
|
buildInputs = libintlOrEmpty
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||||
|
|
||||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue