From 2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 3 Oct 2015 14:07:34 +0200 Subject: pkgconfig: post-merge fixup --- pkgs/development/tools/misc/pkgconfig/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/tools/misc/pkgconfig') diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 0d5e2d275aa2..127223c4ee15 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { }; # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. - patches = optional (!vanilla) ./requires-private.patch; + patches = optional (!vanilla) ./requires-private.patch + ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; + + buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; - configureFlags = [ "--with-internal-glib" ]; postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file - patches = optional stdenv.isCygwin ./2.36.3-not-win32.patch; meta = { description = "A tool that allows packages to find out information about other packages"; -- cgit 1.4.1