diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a99a5059d18c..8b852d4b6d3c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,7 +20,6 @@ , libexif ? null # only needed for Chromium before version 51 # package customization -, enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false , enableWideVine ? false @@ -100,7 +99,6 @@ let pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "56.0.0.0") gtk3; @@ -139,8 +137,8 @@ let gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; - linux_use_bundled_gold = false; - linux_use_gold_flags = true; + use_gold = true; + gold_path = "${stdenv.cc}/bin"; is_debug = false; proprietary_codecs = false; @@ -151,7 +149,6 @@ let enable_nacl = enableNaCl; enable_hotwording = enableHotwording; enable_widevine = enableWideVine; - selinux = enableSELinux; use_cups = cupsSupport; } // { treat_warnings_as_errors = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fdc22a5be006..fdda4f1122e8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,7 +2,6 @@ # package customization , channel ? "stable" -, enableSELinux ? false , enableNaCl ? false , enableHotwording ? false , gnomeSupport ? false, gnome ? null @@ -22,7 +21,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome + inherit enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport enableWideVine; };