diff options
author | koral <koral@mailoo.org> | 2015-04-30 20:20:17 +0000 |
---|---|---|
committer | koral <koral@mailoo.org> | 2015-05-02 07:37:50 +0000 |
commit | e52afb24da9a5c0e0ab749176982578ce2ca5421 (patch) | |
tree | 7cb0cbe1149c16be13b54f9f63b5a9ea6e8ec473 /pkgs/desktops/gnome-2 | |
parent | 64c68c541305cc90428637061b1bbf9e9d0e67ac (diff) | |
download | nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar.gz nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar.bz2 nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar.lz nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar.xz nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.tar.zst nixlib-e52afb24da9a5c0e0ab749176982578ce2ca5421.zip |
gconf: removed heavy dependency on gtk by default.
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 847983e2c491..d4a8e1ff8469 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk }: +, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }: + +assert withGtk -> (gtk != null); stdenv.mkDerivation { name = "GConf-2.32.4"; @@ -9,16 +11,17 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ] + buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; + ++ stdenv.lib.optional (!stdenv.isDarwin) polkit + ++ stdenv.lib.optional withGtk gtk; propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = [ "--with-gtk=2.0" ] + configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0" # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; } |