diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-09-30 07:42:53 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-09-30 07:42:53 +0000 |
| commit | 52b983ff1f2d331b76fab42b1463e3cae77fdbf9 (patch) | |
| tree | ed626bd007059ebae19e30f546df6a4ca502b9fc /pkgs/desktops | |
| parent | 228f0f8c681a9944ee56ba19b5ceebf2e71b95e6 (diff) | |
| download | nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar.gz nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar.bz2 nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar.lz nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar.xz nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.tar.zst nixlib-52b983ff1f2d331b76fab42b1463e3cae77fdbf9.zip | |
GConf needs some more includes specified explcitly..
svn path=/nixpkgs/trunk/; revision=17534
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/GConf/default.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7cc030991868..a50826bb6069 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -39,6 +39,7 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policykit; inherit (pkgs.gtkLibs) glib gtk; inherit intltool ORBit2; + dbus_libs = pkgs.dbus.libs; }; libgnomecanvas = import ./platform/libgnomecanvas { diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix index 834f7d6cff8e..ddf08f63a34c 100644 --- a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2 -, expat, policykit, intltool}: +, expat, policykit, intltool, dbus_libs}: stdenv.mkDerivation { name = "GConf-2.28.0"; @@ -9,9 +9,9 @@ stdenv.mkDerivation { }; 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" + 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" ''; buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2 - expat policykit intltool ]; + expat policykit intltool dbus_libs]; } |