From ff25d193adbbf3220457548165ff7a880bc0848b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Sep 2011 06:22:59 +0000 Subject: [PATCH] glibmm-2.28 svn path=/nixpkgs/trunk/; revision=29385 --- pkgs/development/libraries/glibmm/2.22.x.nix | 24 ------------------- pkgs/development/libraries/glibmm/2.28.x.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/glibmm/2.22.x.nix create mode 100644 pkgs/development/libraries/glibmm/2.28.x.nix diff --git a/pkgs/development/libraries/glibmm/2.22.x.nix b/pkgs/development/libraries/glibmm/2.22.x.nix deleted file mode 100644 index 10b8ad8d3919..000000000000 --- a/pkgs/development/libraries/glibmm/2.22.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.22.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.22/${name}.tar.bz2"; - sha256 = "1h5nxhh6xr1m3jn6bawl3vq5i285k3kdpzqa65zxmxydzm5gy1gi"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix new file mode 100644 index 000000000000..3c2c1fbadce4 --- /dev/null +++ b/pkgs/development/libraries/glibmm/2.28.x.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "glibmm"; + major = "2"; minor = "28"; patchlevel = "2"; extension = "xz"; + sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq"; + }; + + buildNativeInputs = [pkgconfig xz]; + propagatedBuildInputs = [glib libsigcxx]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7710c9bd598..ee57e1098a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3542,7 +3542,7 @@ let glib = callPackage ../development/libraries/glib/2.28.x.nix { }; - glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; + glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; atk = callPackage ../development/libraries/atk/1.32.x.nix { };