forked from mirrors/nixpkgs
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 <aszlig@redmoonstudios.org>
This commit is contained in:
parent
8b666e44fd
commit
e2dba7c6cf
|
@ -24,7 +24,7 @@
|
||||||
, enableNaCl ? false
|
, enableNaCl ? false
|
||||||
, useOpenSSL ? false, nss ? null, openssl ? null
|
, useOpenSSL ? false, nss ? null, openssl ? null
|
||||||
, gnomeSupport ? false, gconf ? null
|
, gnomeSupport ? false, gconf ? null
|
||||||
, gnomeKeyringSupport ? false, libgnome_keyring ? null
|
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
|
||||||
, proprietaryCodecs ? true
|
, proprietaryCodecs ? true
|
||||||
, cupsSupport ? false
|
, cupsSupport ? false
|
||||||
, pulseSupport ? false, pulseaudio ? null
|
, pulseSupport ? false, pulseaudio ? null
|
||||||
|
@ -171,7 +171,7 @@ in stdenv.mkDerivation rec {
|
||||||
libXScrnSaver libXcursor libXtst mesa
|
libXScrnSaver libXcursor libXtst mesa
|
||||||
pciutils protobuf speechd libXdamage
|
pciutils protobuf speechd libXdamage
|
||||||
pythonPackages.gyp
|
pythonPackages.gyp
|
||||||
] ++ optional gnomeKeyringSupport libgnome_keyring
|
] ++ optional gnomeKeyringSupport libgnome_keyring3
|
||||||
++ optionals gnomeSupport [ gconf libgcrypt ]
|
++ optionals gnomeSupport [ gconf libgcrypt ]
|
||||||
++ optional enableSELinux libselinux
|
++ optional enableSELinux libselinux
|
||||||
++ optional cupsSupport libgcrypt
|
++ optional cupsSupport libgcrypt
|
||||||
|
|
Loading…
Reference in a new issue