JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chromium.mkDerivation: update flags

Browse Source 
* Remove libselinux flag: it's no longer supported;
* Use new gold flags.
This commit is contained in:
Nikolay Amiantov 2017-02-08 22:42:06 +03:00
parent 003fa8fed5
commit c5b07975d8
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -20,7 +20,6 @@
, libexif ? null # only needed for Chromium before version 51 , libexif ? null # only needed for Chromium before version 51
# package customization # package customization
, enableSELinux ? false, libselinux ? null
, enableNaCl ? false , enableNaCl ? false
, enableHotwording ? false , enableHotwording ? false
, enableWideVine ? false , enableWideVine ? false
@ -100,7 +99,6 @@ let
pciutils protobuf speechd libXdamage pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring3 ] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "56.0.0.0") gtk3; ++ optional (versionAtLeast version "56.0.0.0") gtk3;
@ -139,8 +137,8 @@ let
gnFlags = mkGnFlags ({ gnFlags = mkGnFlags ({
linux_use_bundled_binutils = false; linux_use_bundled_binutils = false;
linux_use_bundled_gold = false; use_gold = true;
linux_use_gold_flags = true; gold_path = "${stdenv.cc}/bin";
is_debug = false; is_debug = false;
proprietary_codecs = false; proprietary_codecs = false;
@ -151,7 +149,6 @@ let
enable_nacl = enableNaCl; enable_nacl = enableNaCl;
enable_hotwording = enableHotwording; enable_hotwording = enableHotwording;
enable_widevine = enableWideVine; enable_widevine = enableWideVine;
selinux = enableSELinux;
use_cups = cupsSupport; use_cups = cupsSupport;
} // { } // {
treat_warnings_as_errors = false; treat_warnings_as_errors = false;

3
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -2,7 +2,6 @@
# package customization # package customization
, channel ? "stable" , channel ? "stable"
, enableSELinux ? false
, enableNaCl ? false , enableNaCl ? false
, enableHotwording ? false , enableHotwording ? false
, gnomeSupport ? false, gnome ? null , gnomeSupport ? false, gnome ? null
@ -22,7 +21,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 enableSELinux enableNaCl enableHotwording gnomeSupport gnome inherit enableNaCl enableHotwording gnomeSupport gnome
gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
enableWideVine; enableWideVine;
}; };