mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
Merge pull request #4104 from ts468/chromium
Add configuration flag to chromium: hiDPISupport
This commit is contained in:
commit
532cc4b6f3
|
@ -27,6 +27,7 @@
|
|||
, proprietaryCodecs ? true
|
||||
, cupsSupport ? false
|
||||
, pulseSupport ? false, pulseaudio ? null
|
||||
, hiDPISupport ? false
|
||||
|
||||
, source
|
||||
, plugins
|
||||
|
@ -162,6 +163,7 @@ let
|
|||
linux_sandbox_chrome_path="${libExecPath}/${packageName}";
|
||||
werror = "";
|
||||
clang = false;
|
||||
enable_hidpi = hiDPISupport;
|
||||
|
||||
# Google API keys, see:
|
||||
# http://www.chromium.org/developers/how-tos/api-keys
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
, enablePepperPDF ? false
|
||||
, cupsSupport ? false
|
||||
, pulseSupport ? false
|
||||
, hiDPISupport ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -27,7 +28,7 @@ let
|
|||
mkChromiumDerivation = callPackage ./common.nix {
|
||||
inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
|
||||
gnomeKeyringSupport proprietaryCodecs cupsSupport
|
||||
pulseSupport;
|
||||
pulseSupport hiDPISupport;
|
||||
};
|
||||
|
||||
browser = callPackage ./browser.nix { };
|
||||
|
|
|
@ -8528,6 +8528,7 @@ let
|
|||
pulseSupport = config.pulseaudio or true;
|
||||
enablePepperFlash = config.chromium.enablePepperFlash or false;
|
||||
enablePepperPDF = config.chromium.enablePepperPDF or false;
|
||||
hiDPISupport = config.chromium.hiDPISupport or false;
|
||||
};
|
||||
|
||||
chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
|
||||
|
|
Loading…
Reference in a new issue