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

pkgconfig: 0.29 -> 0.29.1 (#24394)

This commit is contained in:
ndowens 2017-04-01 04:06:20 -05:00 committed by Vladimír Čunát
parent 4df59beb01
commit b83d2970f2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,9 @@
{stdenv, fetchurl, automake, libiconv, vanilla ? false }: {stdenv, fetchurl, automake, libiconv, vanilla ? false }:
let with stdenv.lib;
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pkg-config-0.29"; name = "pkg-config-0.29.1";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
@ -13,26 +12,26 @@ stdenv.mkDerivation rec {
"https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
"http://fossies.org/linux/misc/${name}.tar.gz" "http://fossies.org/linux/misc/${name}.tar.gz"
]; ];
sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; sha256 = "00dh1jn8rbppmgbhhgqhmbh3c58b0gccy39rsjdlcma50sg3rd5y";
}; };
# Process Requires.private properly, see # Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738. # 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; ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") preConfigure = optionalString (stdenv.system == "mips64el-linux")
''cp -v ${automake}/share/automake*/config.{sub,guess} .''; ''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ] configureFlags = [ "--with-internal-glib" ]
++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
meta = { meta = {
description = "A tool that allows packages to find out information about other packages"; description = "A tool that allows packages to find out information about other packages";
homepage = http://pkg-config.freedesktop.org/wiki/; homepage = http://pkg-config.freedesktop.org/wiki/;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }