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

Merge pull request #4104 from ts468/chromium

Browse Source 
Add configuration flag to chromium: hiDPISupport
This commit is contained in:
Aristid Breitkreuz 2014-09-16 08:12:10 +02:00
commit 532cc4b6f3
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
, proprietaryCodecs ? true , proprietaryCodecs ? true
, cupsSupport ? false , cupsSupport ? false
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, pulseaudio ? null
, hiDPISupport ? false
, source , source
, plugins , plugins
@ -162,6 +163,7 @@ let
linux_sandbox_chrome_path="${libExecPath}/${packageName}"; linux_sandbox_chrome_path="${libExecPath}/${packageName}";
werror = ""; werror = "";
clang = false; clang = false;
enable_hidpi = hiDPISupport;
# Google API keys, see: # Google API keys, see:
# http://www.chromium.org/developers/how-tos/api-keys # http://www.chromium.org/developers/how-tos/api-keys

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

@ -12,6 +12,7 @@
, enablePepperPDF ? false , enablePepperPDF ? false
, cupsSupport ? false , cupsSupport ? false
, pulseSupport ? false , pulseSupport ? false
, hiDPISupport ? false
}: }:
let let
@ -27,7 +28,7 @@ let
mkChromiumDerivation = callPackage ./common.nix { mkChromiumDerivation = callPackage ./common.nix {
inherit enableSELinux enableNaCl useOpenSSL gnomeSupport inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
gnomeKeyringSupport proprietaryCodecs cupsSupport gnomeKeyringSupport proprietaryCodecs cupsSupport
pulseSupport; pulseSupport hiDPISupport;
}; };
browser = callPackage ./browser.nix { }; browser = callPackage ./browser.nix { };

1
pkgs/top-level/all-packages.nix
View File

@ -8528,6 +8528,7 @@ let
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
enablePepperFlash = config.chromium.enablePepperFlash or false; enablePepperFlash = config.chromium.enablePepperFlash or false;
enablePepperPDF = config.chromium.enablePepperPDF or false; enablePepperPDF = config.chromium.enablePepperPDF or false;
hiDPISupport = config.chromium.hiDPISupport or false;
}; };
chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); chromiumBeta = lowPrio (chromium.override { channel = "beta"; });