From cfe0ffad3a1921e7803c8fe51a43c48047a55004 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Nov 2009 09:17:27 +0000 Subject: [PATCH] * Fixed some more Gnome packages. svn path=/nixpkgs/branches/xorg-7.5/; revision=18088 --- pkgs/desktops/gnome-2.28/default.nix | 19 +++++++---------- .../desktop/gnome-keyring/default.nix | 6 +++++- .../platform/libbonoboui/default.nix | 19 +++++------------ .../gnome-2.28/platform/libglade/default.nix | 8 +++++-- .../gnome-2.28/platform/libgnome/default.nix | 4 ++-- .../platform/libgnomecanvas/default.nix | 9 +++++--- .../platform/libgnomeui/default.nix | 21 +++++++------------ 7 files changed, 40 insertions(+), 46 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 9b80276015de..4d0fc9f2b7d7 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -35,7 +35,7 @@ rec { }; libglade = import ./platform/libglade { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 expat python gettext; + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; }; @@ -51,8 +51,8 @@ rec { }; libgnomecanvas = import ./platform/libgnomecanvas { - inherit (pkgs) stdenv fetchurl pkgconfig cairo; - inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) gtk; inherit intltool libart_lgpl libglade; }; @@ -86,11 +86,9 @@ rec { }; libgnomeui = import ./platform/libgnomeui { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 popt cairo; - inherit (pkgs.xlibs) libX11 libICE; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libgnome libgnomecanvas libbonobo libbonoboui GConf; - inherit gnome_vfs gnome_keyring libglade libart_lgpl ORBit2; + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs; + inherit intltool libgnome libgnomecanvas libbonoboui GConf; + inherit gnome_vfs gnome_keyring libglade glib pango; }; libbonobo = import ./platform/libbonobo { @@ -100,9 +98,8 @@ rec { }; libbonoboui = import ./platform/libbonoboui { - inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2 cairo; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libbonobo GConf libgnomecanvas libgnome libglade ORBit2 libart_lgpl; + inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2; + inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk; }; at_spi = import ./platform/at-spi { diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index 8186c5adec22..fdb885bf595c 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -2,9 +2,13 @@ stdenv.mkDerivation { name = "gnome-keyring-2.28.0"; + src = fetchurl { url = mirror://gnome/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2; sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; }; - buildInputs = [ pkgconfig dbus.libs libgcrypt libtasn1 pam hal python glib gtk intltool GConf ]; + + buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ]; + + propagatedBuildInputs = [ glib libtasn1 ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix index 3e067b90adca..20169161b82a 100644 --- a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, cairo, glib, gtk, atk, pango -, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade, ORBit2, libart_lgpl}: +{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk +, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation { name = "libbonoboui-2.24.2"; + src = fetchurl { url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2; sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f"; }; - buildInputs = [ bison pkgconfig popt gtk libxml2 - intltool libbonobo GConf libgnomecanvas libgnome libglade ]; - - # For some reason GNOME maintainers write crappy automake files and they forget to include - # a lot of required headers (the headers may be found if they are in /usr) - CPPFLAGS = "-I${cairo}/include/cairo -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include " + - "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 " + - "-I${pango}/include/pango-1.0 -I${libgnome}/include/libgnome-2.0 -I${libbonobo}/include/libbonobo-2.0 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 -I${libxml2}/include/libxml2 "+ - "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ - "-I${GConf}/include/gconf/2 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgobject-2.0 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lxml2 -lgnome-2 -lgnomecanvas-2"; + buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ]; + propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix b/pkgs/desktops/gnome-2.28/platform/libglade/default.nix index 70287bf0eb15..93490007692a 100644 --- a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libglade/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl, pkgconfig, gtk, libxml2, expat, python, gettext}: +{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}: stdenv.mkDerivation { name = "libglade-2.6.4"; + src = fetchurl { url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; - buildInputs = [ pkgconfig gtk libxml2 expat python gettext ]; + + buildInputs = [ pkgconfig gtk python gettext ]; + + propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix index a5a7c47c949f..c79a61b883a3 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation { sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv"; }; - buildInputs = [ pkgconfig popt zlib intltool esound GConf gnome_vfs ]; - propagatedBuildInputs = [ glib libbonobo ]; + buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ]; + propagatedBuildInputs = [ glib libbonobo esound ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix index 12c31c0382ee..95f484ff7a40 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, pango, atk, cairo, intltool, libart_lgpl, libglade}: +{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }: stdenv.mkDerivation { name = "libgnomecanvas-2.26.0"; + src = fetchurl { url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2; sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; }; - buildInputs = [ pkgconfig gtk intltool libart_lgpl libglade ]; - CPPFLAGS = "-I${libglade}/include/libglade-2.0 -I${libart_lgpl}/include/libart-2.0 -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${atk}/include/atk-1.0 -I${cairo}/include/cairo -I${pango}/include/pango-1.0"; + + buildInputs = [ pkgconfig intltool libglade ]; + + propagatedBuildInputs = [ libart_lgpl gtk ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix index 822e14bbd7e8..d3edee3ffd3d 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix @@ -1,21 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, popt, cairo, libX11, libICE, glib, gtk, atk, pango -, intltool, libgnome, libgnomecanvas, libbonobo, libbonoboui, GConf -, gnome_vfs, gnome_keyring, libglade, libart_lgpl, ORBit2}: +{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +, intltool, libgnome, libgnomecanvas, libbonoboui, GConf +, gnome_vfs, gnome_keyring, libglade }: stdenv.mkDerivation { name = "libgnomeui-2.24.2"; + src = fetchurl { url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2; sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f"; }; - buildInputs = [ pkgconfig libxml2 popt libX11 libICE glib gtk pango - intltool libgnome libgnomecanvas libbonoboui GConf gnome_vfs gnome_keyring libglade ]; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${libbonoboui}/include/libbonoboui-2.0 "+ - "-I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ - "-I${libgnome}/include/libgnome-2.0 -I${libart_lgpl}/include/libart-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ - "-I${libbonobo}/include/libbonobo-2.0 -I${GConf}/include/gconf/2 -I${libxml2}/include/libxml2 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 "+ - "-I${gnome_keyring}/include/gnome-keyring-1 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgtk-x11-2.0 -lgnomecanvas-2 -lgconf-2 -lbonoboui-2 -lgnome-keyring"; + + buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ]; + + propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; }