From b1e4ed38dd23f1a54afd31c1a411171548ca450c Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Fri, 22 Jul 2016 21:22:08 +0300 Subject: [PATCH 1/2] iconv: fix build for mips-linux --- pkgs/development/libraries/libiconv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ''; From 6d998e638660718ad82fadb8e6b7b6cf1d9563f3 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Fri, 22 Jul 2016 21:22:45 +0300 Subject: [PATCH 2/2] perl: fix build for mips-linux --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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) ''