diff options
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libiconv/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 11a7acd617c7..99860c304685 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -71,8 +71,8 @@ let preConfigure = '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") + '' + optionalString (stdenv.isArm || stdenv.isMips) '' + configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9b62436ae080..5f1f6afcec12 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; postPatch = - lib.optionalString (stdenv.cross.libc or null == "msvcrt") + lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; |