diff options
| author | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-07-04 00:21:46 +1000 |
|---|---|---|
| committer | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-07-04 00:21:46 +1000 |
| commit | a42133a102a6c00d98de985b1d3073eed173c8aa (patch) | |
| tree | 84de6687179864b3762c6cfd5453d28a1613b118 /pkgs/desktops | |
| parent | 216d47be0c39df07c4cd3bfcf4f05b01a8409a78 (diff) | |
| download | nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar.gz nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar.bz2 nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar.lz nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar.xz nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.tar.zst nixlib-a42133a102a6c00d98de985b1d3073eed173c8aa.zip | |
gnome.GConf: fix build on darwin
* disable polkit * add --enable-static to configureFlags
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 4769247a5162..847983e2c491 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -9,10 +9,16 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ]; + buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ] + # polkit requires pam, which requires shadow.h, which is not available on + # darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; + propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = "--with-gtk=2.0"; + configureFlags = [ "--with-gtk=2.0" ] + # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin + ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; } |