From 57e127099b106b5d584a896051c9f2df0e6965ee Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 20:21:31 +0200 Subject: [PATCH] chromium: Add flag to disable Gnome support. This also separates gcrypt and gconf from the basic dependencies. Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to work on a patch to get rid of it? On the other hand it seems to be a TODO of the chromium project itself, so let's wait and see. --- .../applications/networking/browsers/chromium/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 57f07385df3..90c146f8e3b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,6 +18,7 @@ , useSELinux ? false , naclSupport ? false , useOpenSSL ? true +, enableGnomeSupport ? false , gnomeKeyringSupport ? false , useProprietaryCodecs ? false }: @@ -83,9 +84,10 @@ in stdenv.mkDerivation rec { utillinux alsaLib gcc bison gperf krb5 - glib gtk gconf libgcrypt dbus_glib + glib gtk dbus_glib libXScrnSaver libXcursor - ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; + ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring + ++ stdenv.lib.optionals enableGnomeSupport [ gconf libgcrypt ]; opensslPatches = stdenv.lib.optional useOpenSSL openssl.patches; @@ -102,6 +104,8 @@ in stdenv.mkDerivation rec { linux_use_gold_flags = false; proprietary_codecs = false; use_gnome_keyring = gnomeKeyringSupport; + use_gconf = enableGnomeSupport; + use_gio = enableGnomeSupport; disable_nacl = !naclSupport; use_openssl = useOpenSSL; selinux = useSELinux;