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

treewide: remove libintl hacks

Browse Source
This commit is contained in:
Matthew Bauer
2018-03-14 14:15:06 -05:00
parent 9e75fb5eb4
commit ed2a9cf65f
56 changed files with 107 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
, gobjectIntrospection, dbus, libintlOrEmpty
, gobjectIntrospection, dbus
, fixDarwinDylibNames
}:
@@ -14,10 +14,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
buildInputs = libintlOrEmpty
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
patches = [
# https://gitlab.gnome.org/GNOME/json-glib/issues/27