Fix GConf from Gnome 2.26

svn path=/nixpkgs/trunk/; revision=16751
This commit is contained in:
Michael Raskin 2009-08-17 18:31:42 +00:00
parent dd9f68b1f5
commit a194af141b
3 changed files with 25 additions and 1 deletions

View File

@ -36,9 +36,10 @@ rec {
};
GConf = import ./platform/GConf {
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policy_kit;
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat;
inherit (pkgs.gtkLibs) glib gtk;
inherit intltool ORBit2;
policy_kit = pkgs.policy_kit_0_9;
};
libgnomecanvas = import ./platform/libgnomecanvas {

View File

@ -0,0 +1,16 @@
args: with args;
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "PolicyKit-0.9";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7";
};
buildInputs = [
pkgconfig expat intltool glib dbus dbus_glib pam gettext
];
}

View File

@ -3914,6 +3914,13 @@ let
inherit (gtkLibs) glib;
};
policy_kit_0_9 = import ../development/libraries/policy-kit/0.9.nix {
inherit stdenv fetchurl pkgconfig expat pam intltool gettext
dbus_glib;
inherit (gtkLibs) glib;
dbus = dbus.libs;
};
poppler = import ../development/libraries/poppler {
inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
pkgconfig;