From 304e339d4f65aa12906c4007b06b9eb002f6a333 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Nov 2009 22:07:32 +0000 Subject: [PATCH] * Added libglademm. svn path=/nixpkgs/branches/xorg-7.5/; revision=18120 --- .../gnome-2.28/bindings/libglademm/default.nix | 14 ++++++++++++++ pkgs/desktops/gnome-2.28/default.nix | 12 +++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix diff --git a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix new file mode 100644 index 00000000000..c140eb944c6 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }: + +stdenv.mkDerivation rec { + name = "libglademm-2.6.7"; + + src = fetchurl { + url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; + sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; + }; + + buildInputs = [ pkgconfig intltool ]; + + propagatedBuildInputs = [ gtkmm libglade ]; +} diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index ef08afbf738..c0e68fd9b54 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -2,7 +2,7 @@ pkgs: rec { - inherit (pkgs.gtkLibs) glib pango atk gtk; + inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; # Backward compatibility. gnomevfs = gnome_vfs; @@ -14,11 +14,11 @@ rec { libgnomeprint = throw "libgnomeprint not implemented"; libgtkhtml = throw "libgtkhtml not implemented"; vte = throw "vte not implemented"; - libglademm = throw "libglademm not implemented"; gtksourceview_24 = gtksourceview; #### PLATFORM + audiofile = import ./platform/audiofile { inherit (pkgs) stdenv fetchurl; }; @@ -280,7 +280,13 @@ rec { gnome_icon_theme = import ./desktop/gnome-icon-theme { inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils; - #inherit (pkgs.gtkLibs) gtk pango; }; +#### BINDINGS + + libglademm = import ./bindings/libglademm { + inherit (pkgs) stdenv fetchurl pkgconfig intltool; + inherit gtkmm libglade; + }; + }