diff options
| author | Daniel Barlow <dan@telent.net> | 2017-12-05 10:27:45 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-23 20:43:42 -0500 |
| commit | 9c50ae6898b2d5dccd6e030c80535fb1a32f703d (patch) | |
| tree | f957c334d3b0885adcca2cefa6f90ab805443e30 /pkgs/development/tools/misc/pkgconfig | |
| parent | 2682ba63bc0c4dea159ec664d63d375a8d75b12a (diff) | |
| download | nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar.gz nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar.bz2 nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar.lz nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar.xz nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.tar.zst nixlib-9c50ae6898b2d5dccd6e030c80535fb1a32f703d.zip | |
lib, treewide: Add missing MIPS arches, and fix existing usage
Existing "mips64el" should be "mipsel". This is just the barest minimum so that nixpkgs can recognize them as systems - although required for building individual derivations onto MIPS boards, it is not sufficient if you want to actually build nixos on those targets
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 7cfd78a39a28..15d00b0a2a52 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -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" ] |