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

treewide: remove libiconv hacks

Browse Source
This commit is contained in:
Matthew Bauer 2018-03-14 14:17:05 -05:00
parent ed2a9cf65f
commit 929f469ede
6 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/libnatspec/default.nix
View File

@ -19,6 +19,5 @@ stdenv.mkDerivation (rec {
maintainers = [ ];
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_LDFLAGS = "-liconv";
propagatedBuildInputs = [ libiconv ];
})

3
pkgs/development/libraries/stfl/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
sed -i s/gcc/cc/g Makefile
sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
'' + stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") ''
sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile
'' + ( stdenv.lib.optionalString stdenv.isDarwin ''
sed -i s/-soname/-install_name/ Makefile
'' ) + ''
@ -36,4 +34,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/tools/misc/aescrypt/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libiconv ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
meta = with stdenv.lib; {
description = "Encrypt files with Advanced Encryption Standard (AES)";
homepage = https://www.aescrypt.com/;

2
pkgs/tools/networking/whois/default.nix
View File

@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
for i in Makefile po/Makefile; do
substituteInPlace $i --replace "prefix = /usr" "prefix = $out"
done
'' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) ''
echo "whois_LDADD += -liconv" >> Makefile
'';
makeFlags = [ "HAVE_ICONV=1" ];

2
pkgs/tools/text/odt2txt/default.nix
View File

@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libiconv ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
meta = {
description = "Simple .odt to .txt converter";
homepage = http://stosberg.net/odt2txt;

3
pkgs/tools/text/unrtf/default.nix
View File

@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
buildInputs = [ libiconv ];
preConfigure = "./bootstrap";