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

6
pkgs/development/libraries/libmicrohttpd/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }:
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }:
stdenv.mkDerivation rec {
name = "libmicrohttpd-${version}";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" "info" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgcrypt curl gnutls ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ];
buildInputs = [ libgcrypt curl gnutls libiconv libintl ];
preCheck = ''
# Since `localhost' can't be resolved in a chroot, work around it.
@@ -38,4 +37,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}