From e2dba7c6cffd5c48a2f2e17d33b0560bad172d32 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Mar 2014 12:29:59 +0100 Subject: [PATCH] chromium: Use version 3 of libgnome_keyring. Starting with version 35, version 2 of libgnome_keyring is no longer supported and it's probably pretty useless to do backports to version 2, given the assumption that most users on Nix probably don't use it. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 213e75ee6efa..7ae83186567a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -24,7 +24,7 @@ , enableNaCl ? false , useOpenSSL ? false, nss ? null, openssl ? null , gnomeSupport ? false, gconf ? null -, gnomeKeyringSupport ? false, libgnome_keyring ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? false , pulseSupport ? false, pulseaudio ? null @@ -171,7 +171,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage pythonPackages.gyp - ] ++ optional gnomeKeyringSupport libgnome_keyring + ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt