about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorAristid Breitkreuz <aristidb@gmail.com>2014-09-16 08:12:10 +0200
committerAristid Breitkreuz <aristidb@gmail.com>2014-09-16 08:12:10 +0200
commit532cc4b6f30b0e89bd990b515c923c5ee2879b33 (patch)
treea63683c36916ffef4d8740cb4abd24ddca683c7a /pkgs/applications/networking/browsers
parent0b586622db2a41c0cc657e7a036cd5588b350992 (diff)
parent1f28161a41f4d9d78a9de953ae28f735b9f9c148 (diff)
downloadnixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar.gz
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar.bz2
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar.lz
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar.xz
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.tar.zst
nixlib-532cc4b6f30b0e89bd990b515c923c5ee2879b33.zip
Merge pull request #4104 from ts468/chromium
Add configuration flag to chromium: hiDPISupport
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix3
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 46dadd280c9a..2676104db3e0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -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
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 4dfdca882bc8..e02232162af1 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -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 { };