diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/development/tools/misc/pkgconfig/default.nix | |
parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
download | nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index f1471d51e1f..6eea0a6d5d6 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, automake, libiconv, vanilla ? false}: stdenv.mkDerivation (rec { - name = "pkg-config-0.28"; + name = "pkg-config-0.29"; setupHook = ./setup-hook.sh; src = fetchurl { url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb"; + sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; }; buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; |