From 501cc845a05d21a388f4d082b4b3d545b09f0d66 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:23:08 +0000 Subject: [PATCH] pangomm-2.28 svn path=/nixpkgs/trunk/; revision=29386 --- .../libraries/pangomm/{2.26.x.nix => 2.28.x.nix} | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/development/libraries/pangomm/{2.26.x.nix => 2.28.x.nix} (70%) diff --git a/pkgs/development/libraries/pangomm/2.26.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix similarity index 70% rename from pkgs/development/libraries/pangomm/2.26.x.nix rename to pkgs/development/libraries/pangomm/2.28.x.nix index ce1c5207e32..59b6eca64d3 100644 --- a/pkgs/development/libraries/pangomm/2.26.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: +{ stdenv, fetchurl_gnome, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { - name = "pangomm-2.26.0"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/pangomm/2.26/${name}.tar.bz2"; - sha256 = "0ph93cjbzmb36k6a9cjd1pcch0ba4bzq1jnf69f1xj0j5kjfn9mz"; + src = fetchurl_gnome { + project = "pangomm"; + major = "2"; minor = "28"; patchlevel = "2"; + sha256 = "13yq5zwxzliiss4ladaa7di2b3s965p3zbz7s0ccz9ddbqj9f7gc"; }; - buildInputs = [ pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee57e1098a6..e3451ab7e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,7 +3550,7 @@ let pango = callPackage ../development/libraries/pango/1.28.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; + pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };