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-22 16:50:11 -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
pkgs/tools/networking/wget/default.nix
+3 -5
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, perl
, libidn2, zlib, pcre, libuuid, libiconv
, libidn2, zlib, pcre, libuuid, libiconv, libintl
, IOSocketSSL, LWP, python3, lzip
, libpsl ? null
, openssl ? null }:
@@ -25,12 +25,10 @@ stdenv.mkDerivation rec {
do
sed -i "$i" -e's/localhost/127.0.0.1/g'
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export LIBS="-liconv -lintl"
'';
nativeBuildInputs = [ gettext pkgconfig perl lzip ];
buildInputs = [ libidn2 libiconv zlib pcre libuuid ]
nativeBuildInputs = [ gettext pkgconfig perl lzip libiconv libintl ];
buildInputs = [ libidn2 zlib pcre libuuid ]
++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (openssl != null) openssl
++ stdenv.lib.optional (libpsl != null) libpsl