swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-27 07:30:18 +02:00
Code Issues 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
# 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;

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

@ -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;
};