diff options
| author | Ivan Kozik <ivan@ludios.org> | 2019-12-14 18:07:28 +0000 |
|---|---|---|
| committer | Ivan Kozik <ivan@ludios.org> | 2019-12-15 04:55:30 +0000 |
| commit | 950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e (patch) | |
| tree | 00470338e11834a94c29bf2c4901e8d5efc3d270 | |
| parent | ec75ea3329b8303ad89d7263c46b4500b860526c (diff) | |
| download | nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.gz nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.bz2 nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.lz nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.xz nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.zst nixpkgs-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.zip | |
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.
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index edb0b4ce02c..378e2a8224c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -23,7 +23,6 @@ , libva ? null # useVaapi # package customization -, enableNaCl ? false , useVaapi ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -228,7 +227,9 @@ let use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; 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; use_cups = cupsSupport; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7ef2bd20539..5f7dc485f3e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -7,7 +7,6 @@ # package customization , channel ? "stable" -, enableNaCl ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -31,9 +30,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableNaCl gnomeSupport gnome - gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport - useVaapi; + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi; }; browser = callPackage ./browser.nix { inherit channel enableWideVine; }; |