JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give up and use older GConf

Browse Source 
svn path=/nixpkgs/trunk/; revision=17540
This commit is contained in:
Michael Raskin 2009-09-30 11:21:58 +00:00
parent acce623d3f
commit f8abffe6b1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/gnome-2.28/platform/GConf/default.nix
View File

@ -2,14 +2,15 @@
, expat, policykit, intltool, dbus_libs}:
stdenv.mkDerivation {
name = "GConf-2.28.0";
name = "GConf-2.26.2";
src = fetchurl {
url = mirror://gnome/sources/GConf/2.28/GConf-2.28.0.tar.bz2;
sha256 = "1j3ah0f71yv4di3fvv1aahcjvqfwsxw2m71ljbjq0apv5gzdqmyh";
url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2;
sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${dbus_glib}/include/dbus-1.0 -I${policykit}/include/PolicyKit -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_libs}/include/dbus-1.0 -I${dbus_libs}/lib/dbus-1.0/include"
export NIX_LDFLAGS="$NIX_LDFLAGS $(glib-config --libs)"
'';
buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2

10
pkgs/top-level/all-packages.nix
View File

@ -3077,6 +3077,11 @@ let
inherit (gtkLibs) glib;
};
dbus_glib_gtk_218 = import ../development/libraries/dbus-glib {
inherit fetchurl stdenv pkgconfig gettext dbus expat;
inherit (gtkLibs218) glib;
};
dclib = import ../development/libraries/dclib {
inherit fetchurl stdenv libxml2 openssl bzip2;
};
@ -8086,7 +8091,10 @@ let
gnome26 = import ../desktops/gnome-2.26 pkgs;
gnome28 = import ../desktops/gnome-2.28 (pkgs// {gtkLibs = gtkLibs218;});
gnome28 = import ../desktops/gnome-2.28 (pkgs// {
gtkLibs = gtkLibs218;
dbus_glib = dbus_glib_gtk_218;
});
kde3 = {