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

Merge pull request #17242 from rasendubi/mips-linux

Browse Source 
Fixes for mips-linux
This commit is contained in:
Rok Garbas 2016-07-27 19:01:11 +02:00 committed by GitHub
commit cd1dadf860
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/perl/default.nix
View File

@ -71,8 +71,8 @@ let
preConfigure = preConfigure =
'' ''
configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
'' + optionalString stdenv.isArm '' '' + optionalString (stdenv.isArm || stdenv.isMips) ''
configureFlagsArray=(-Dldflags="-lm -lrt") configureFlagsArray=(-Dldflags="-lm -lrt")
'' + optionalString stdenv.isDarwin '' '' + optionalString stdenv.isDarwin ''
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
'' + optionalString (!enableThreading) '' '' + optionalString (!enableThreading) ''

2
pkgs/development/libraries/libiconv/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
]; ];
postPatch = 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 sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
''; '';