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

Merge pull request #35247 from telent/mips32

Browse Source 
lib, treewide: Add missing MIPS arches, and fix existing usage
This commit is contained in:
John Ericson
2018-02-27 14:01:15 -05:00
committed by GitHub
parent ac4e65cee7 9c50ae6898
commit dfc5d7835d
14 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
patches = optional (!vanilla) ./requires-private.patch
++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
preConfigure = optionalString (stdenv.system == "mips64el-linux")
''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ]