diff options
| author | Rok Garbas <rok@garbas.si> | 2016-07-27 19:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 19:01:11 +0200 |
| commit | cd1dadf860836a1594f4bd5dd1ce5d86026e7d12 (patch) | |
| tree | ef0b52e1855e0841d6f191e98a584af695ace171 /pkgs/development | |
| parent | f51169366b06f513fbb7657b979fa1cc62cd2ed7 (diff) | |
| parent | 6d998e638660718ad82fadb8e6b7b6cf1d9563f3 (diff) | |
| download | nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.gz nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.bz2 nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.lz nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.xz nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.tar.zst nixlib-cd1dadf860836a1594f4bd5dd1ce5d86026e7d12.zip | |
Merge pull request #17242 from rasendubi/mips-linux
Fixes for mips-linux
Diffstat (limited to 'pkgs/development')
| -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 ''; |