about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/common.nix
diff options
context:
space:
mode:
authorIvan Kozik <ivan@ludios.org>2019-12-14 18:07:28 +0000
committerIvan Kozik <ivan@ludios.org>2019-12-15 04:55:30 +0000
commit950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e (patch)
tree00470338e11834a94c29bf2c4901e8d5efc3d270 /pkgs/applications/networking/browsers/chromium/common.nix
parentec75ea3329b8303ad89d7263c46b4500b860526c (diff)
downloadnixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar
nixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.gz
nixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.bz2
nixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.lz
nixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.xz
nixlib-950230bc84a09363edb2e3a1e5eb70bd2d1a3c4e.tar.zst
nixlib-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.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index edb0b4ce02c6..378e2a8224c3 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;