From 5f18ccb001caf62e9c4908354a1fea44bb11300b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 29 Oct 2016 04:01:04 +0200
Subject: [PATCH] chromium: Remove flag for hiDPISupport

This should now be the upstream default and there also is no more flag
for GN to set it, so we'll no longer need it on our side as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common-gn.nix | 2 --
 pkgs/applications/networking/browsers/chromium/common.nix    | 2 --
 pkgs/applications/networking/browsers/chromium/default.nix   | 4 +---
 pkgs/top-level/all-packages.nix                              | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common-gn.nix b/pkgs/applications/networking/browsers/chromium/common-gn.nix
index 68798071ea1..b574edef205 100644
--- a/pkgs/applications/networking/browsers/chromium/common-gn.nix
+++ b/pkgs/applications/networking/browsers/chromium/common-gn.nix
@@ -28,7 +28,6 @@
 , proprietaryCodecs ? true
 , cupsSupport ? true
 , pulseSupport ? false, libpulseaudio ? null
-, hiDPISupport ? false
 
 , upstream-info
 }:
@@ -154,7 +153,6 @@ let
     } // {
       treat_warnings_as_errors = false;
       is_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/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8f6e324765f..3ff90d28b9f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -28,7 +28,6 @@
 , proprietaryCodecs ? true
 , cupsSupport ? true
 , pulseSupport ? false, libpulseaudio ? null
-, hiDPISupport ? false
 
 , upstream-info
 }:
@@ -179,7 +178,6 @@ let
     } // {
       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 a16326fc98c..fd42c1b927b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -12,7 +12,6 @@
 , enableWideVine ? false
 , cupsSupport ? true
 , pulseSupport ? false
-, hiDPISupport ? false
 }:
 
 let
@@ -28,8 +27,7 @@ let
 
     mkChromiumDerivation = callPackage common {
       inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome
-              gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
-              hiDPISupport;
+              gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport;
     };
 
     browser = callPackage ./browser.nix { inherit channel; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2ee0c9c7e5..764c4822cb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12277,7 +12277,6 @@ in
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
     enableWideVine = config.chromium.enableWideVine or false;
-    hiDPISupport = config.chromium.hiDPISupport or false;
     gnome = gnome2;
   };