diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:07:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:08:48 +0200 |
| commit | 2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb (patch) | |
| tree | 086ec7f6849ba8252c011c88825cb581ed2c11c3 /pkgs/development/tools/misc/pkgconfig | |
| parent | f72376fd20d2abd0a58d5aabc0712480d567f7eb (diff) | |
| download | nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar.gz nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar.bz2 nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar.lz nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar.xz nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.tar.zst nixlib-2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb.zip | |
pkgconfig: post-merge fixup
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
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"; |