From 9ed137c45b3e8f5196cf3ac56d596b6c74694ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Jan 2012 01:29:17 +0000 Subject: [PATCH] Picking in pkgconfig the latest config.guess, as it does not know mips64el-linux 3.2.0. svn path=/nixpkgs/trunk/; revision=31754 --- pkgs/development/tools/misc/pkgconfig/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 22035f6fee7..ae5048f6306 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, automake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "pkg-config-0.23"; setupHook = ./setup-hook.sh; @@ -21,5 +21,9 @@ stdenv.mkDerivation rec { homepage = http://pkg-config.freedesktop.org/wiki/; }; -} - +} // (if stdenv.system == "mips64el-linux" then + { + preConfigure = '' + cp -v ${automake}/share/automake*/config.{sub,guess} . + ''; + } else {}))