chromium: remove enableNaCl option
This hasn't worked since 2016 (https://github.com/NixOS/nixpkgs/issues/13983) and is being removed very soon, per "Q4 2019" in https://developer.chrome.com/native-client/migration (It's staying around for "Chrome Apps", but those only run on ChromeOS now.) earth.google.com users can use https://earth.google.com/web/?beta=1 to get the wasm version instead of the PNaCl version.
This commit is contained in:
parent
ec75ea3329
commit
950230bc84
@ -23,7 +23,6 @@
|
|||||||
, libva ? null # useVaapi
|
, libva ? null # useVaapi
|
||||||
|
|
||||||
# package customization
|
# package customization
|
||||||
, enableNaCl ? false
|
|
||||||
, useVaapi ? false
|
, useVaapi ? false
|
||||||
, gnomeSupport ? false, gnome ? null
|
, gnomeSupport ? false, gnome ? null
|
||||||
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
|
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
|
||||||
@ -228,7 +227,9 @@ let
|
|||||||
use_sysroot = false;
|
use_sysroot = false;
|
||||||
use_gnome_keyring = gnomeKeyringSupport;
|
use_gnome_keyring = gnomeKeyringSupport;
|
||||||
use_gio = gnomeSupport;
|
use_gio = gnomeSupport;
|
||||||
enable_nacl = enableNaCl;
|
# ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy',
|
||||||
|
# needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it
|
||||||
|
enable_nacl = false;
|
||||||
enable_widevine = true;
|
enable_widevine = true;
|
||||||
use_cups = cupsSupport;
|
use_cups = cupsSupport;
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
# package customization
|
# package customization
|
||||||
, channel ? "stable"
|
, channel ? "stable"
|
||||||
, enableNaCl ? false
|
|
||||||
, gnomeSupport ? false, gnome ? null
|
, gnomeSupport ? false, gnome ? null
|
||||||
, gnomeKeyringSupport ? false
|
, gnomeKeyringSupport ? false
|
||||||
, proprietaryCodecs ? true
|
, proprietaryCodecs ? true
|
||||||
@ -31,9 +30,7 @@ let
|
|||||||
upstream-info = (callPackage ./update.nix {}).getChannel channel;
|
upstream-info = (callPackage ./update.nix {}).getChannel channel;
|
||||||
|
|
||||||
mkChromiumDerivation = callPackage ./common.nix {
|
mkChromiumDerivation = callPackage ./common.nix {
|
||||||
inherit enableNaCl gnomeSupport gnome
|
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi;
|
||||||
gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
|
|
||||||
useVaapi;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
|
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user