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

GConf needs some more includes specified explcitly..

Browse Source 
svn path=/nixpkgs/trunk/; revision=17534
This commit is contained in:
Michael Raskin 2009-09-30 07:42:53 +00:00
parent 228f0f8c68
commit 52b983ff1f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ rec {
inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policykit; inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policykit;
inherit (pkgs.gtkLibs) glib gtk; inherit (pkgs.gtkLibs) glib gtk;
inherit intltool ORBit2; inherit intltool ORBit2;
dbus_libs = pkgs.dbus.libs;
}; };
libgnomecanvas = import ./platform/libgnomecanvas { libgnomecanvas = import ./platform/libgnomecanvas {

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2 { stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2
, expat, policykit, intltool}: , expat, policykit, intltool, dbus_libs}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "GConf-2.28.0"; name = "GConf-2.28.0";
@ -9,9 +9,9 @@ stdenv.mkDerivation {
}; };
preConfigure = '' 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 buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2
expat policykit intltool ]; expat policykit intltool dbus_libs];
} }