From b83d2970f27116bfdd14eb8c21425457a251c725 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 1 Apr 2017 04:06:20 -0500 Subject: [PATCH] pkgconfig: 0.29 -> 0.29.1 (#24394) --- .../tools/misc/pkgconfig/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index d0e63469987..7b7bbc279aa 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,10 +1,9 @@ {stdenv, fetchurl, automake, libiconv, vanilla ? false }: -let - inherit (stdenv.lib) optional; -in +with stdenv.lib; + stdenv.mkDerivation rec { - name = "pkg-config-0.29"; +name = "pkg-config-0.29.1"; setupHook = ./setup-hook.sh; @@ -13,26 +12,26 @@ stdenv.mkDerivation rec { "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" "http://fossies.org/linux/misc/${name}.tar.gz" ]; - sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; + sha256 = "00dh1jn8rbppmgbhhgqhmbh3c58b0gccy39rsjdlcma50sg3rd5y"; }; # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. patches = optional (!vanilla) ./requires-private.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} .''; - buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; 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 meta = { description = "A tool that allows packages to find out information about other packages"; homepage = http://pkg-config.freedesktop.org/wiki/; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; }