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

10
pkgs/development/libraries/glib/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python
, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf, gnome3
, libiconv, libintl, zlib, libffi, pcre, libelf, gnome3
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
@@ -66,10 +66,9 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount
++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];
nativeBuildInputs = [ pkgconfig gettext perl python ];
nativeBuildInputs = [ pkgconfig gettext perl python libintl libiconv ];
propagatedBuildInputs = [ zlib libffi libiconv ]
++ libintlOrEmpty;
propagatedBuildInputs = [ zlib libffi ];
# internal pcre would only add <200kB, but it's relatively common
configureFlags = [ "--with-pcre=system" ]
@@ -84,8 +83,7 @@ stdenv.mkDerivation rec {
# GElf only supports elf64 hosts
++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf";
NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl"
++ optional stdenv.isSunOS "-DBSD_COMP";
NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP";
preConfigure = optionalString stdenv.isSunOS ''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure