treewide: remove libiconv hacks
This commit is contained in:
parent
ed2a9cf65f
commit
929f469ede
|
@ -19,6 +19,5 @@ stdenv.mkDerivation (rec {
|
|||
maintainers = [ ];
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
|
||||
NIX_LDFLAGS = "-liconv";
|
||||
propagatedBuildInputs = [ libiconv ];
|
||||
})
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -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/;
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
Loading…
Reference in a new issue