ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

* Fixed some more Gnome packages.

Browse Source 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18088
This commit is contained in:
Eelco Dolstra 2009-11-04 09:17:27 +00:00
parent 7cec6e4f52
commit cfe0ffad3a
7 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/gnome-2.28/default.nix
View File

@ -35,7 +35,7 @@ rec {
}; };
libglade = import ./platform/libglade { 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; inherit (pkgs.gtkLibs) gtk;
}; };
@ -51,8 +51,8 @@ rec {
}; };
libgnomecanvas = import ./platform/libgnomecanvas { libgnomecanvas = import ./platform/libgnomecanvas {
inherit (pkgs) stdenv fetchurl pkgconfig cairo; inherit (pkgs) stdenv fetchurl pkgconfig;
inherit (pkgs.gtkLibs) glib gtk pango atk; inherit (pkgs.gtkLibs) gtk;
inherit intltool libart_lgpl libglade; inherit intltool libart_lgpl libglade;
}; };
@ -86,11 +86,9 @@ rec {
}; };
libgnomeui = import ./platform/libgnomeui { libgnomeui = import ./platform/libgnomeui {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 popt cairo; inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs;
inherit (pkgs.xlibs) libX11 libICE; inherit intltool libgnome libgnomecanvas libbonoboui GConf;
inherit (pkgs.gtkLibs) glib gtk atk pango; inherit gnome_vfs gnome_keyring libglade glib pango;
inherit intltool libgnome libgnomecanvas libbonobo libbonoboui GConf;
inherit gnome_vfs gnome_keyring libglade libart_lgpl ORBit2;
}; };
libbonobo = import ./platform/libbonobo { libbonobo = import ./platform/libbonobo {
@ -100,9 +98,8 @@ rec {
}; };
libbonoboui = import ./platform/libbonoboui { libbonoboui = import ./platform/libbonoboui {
inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2 cairo; inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2;
inherit (pkgs.gtkLibs) glib gtk atk pango; inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk;
inherit intltool libbonobo GConf libgnomecanvas libgnome libglade ORBit2 libart_lgpl;
}; };
at_spi = import ./platform/at-spi { at_spi = import ./platform/at-spi {

6
pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
View File

@ -2,9 +2,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnome-keyring-2.28.0"; name = "gnome-keyring-2.28.0";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2; url = mirror://gnome/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2;
sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; 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 ];
} }

19
pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix
View File

@ -1,23 +1,14 @@
{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, cairo, glib, gtk, atk, pango { stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk
, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade, ORBit2, libart_lgpl}: , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libbonoboui-2.24.2"; name = "libbonoboui-2.24.2";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2; url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2;
sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f"; 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 " + buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ];
"-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 " + propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
"-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";
} }

8
pkgs/desktops/gnome-2.28/platform/libglade/default.nix
View File

@ -1,10 +1,14 @@
{stdenv, fetchurl, pkgconfig, gtk, libxml2, expat, python, gettext}: {stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libglade-2.6.4"; name = "libglade-2.6.4";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2;
sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
}; };
buildInputs = [ pkgconfig gtk libxml2 expat python gettext ];
buildInputs = [ pkgconfig gtk python gettext ];
propagatedBuildInputs = [ libxml2 ];
} }

4
pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
View File

@ -9,6 +9,6 @@ stdenv.mkDerivation {
sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv"; sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv";
}; };
buildInputs = [ pkgconfig popt zlib intltool esound GConf gnome_vfs ]; buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ];
propagatedBuildInputs = [ glib libbonobo ]; propagatedBuildInputs = [ glib libbonobo esound ];
} }

9
pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "libgnomecanvas-2.26.0"; name = "libgnomecanvas-2.26.0";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2; url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2;
sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; 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 ];
} }

21
pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix
View File

@ -1,21 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libxml2, popt, cairo, libX11, libICE, glib, gtk, atk, pango { stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
, intltool, libgnome, libgnomecanvas, libbonobo, libbonoboui, GConf , intltool, libgnome, libgnomecanvas, libbonoboui, GConf
, gnome_vfs, gnome_keyring, libglade, libart_lgpl, ORBit2}: , gnome_vfs, gnome_keyring, libglade }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libgnomeui-2.24.2"; name = "libgnomeui-2.24.2";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2; url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2;
sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f"; sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f";
}; };
buildInputs = [ pkgconfig libxml2 popt libX11 libICE glib gtk pango
intltool libgnome libgnomecanvas libbonoboui GConf gnome_vfs gnome_keyring libglade ]; buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib 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 "+ propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
"-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";
} }