From a42133a102a6c00d98de985b1d3073eed173c8aa Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 00:21:46 +1000 Subject: [PATCH] gnome.GConf: fix build on darwin * disable polkit * add --enable-static to configureFlags --- pkgs/desktops/gnome-2/platform/GConf/default.nix | 10 ++++++++-- 1 file 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 4769247a516..847983e2c49 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" ]; }