From e5b1a5724e22bbe09966c62c33ed5822268b911d Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Mon, 1 Jan 2018 21:50:26 +0100
Subject: Qt5: 5.9.3 -> 5.10.0

---
 pkgs/top-level/all-packages.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'pkgs/top-level')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 912714a455094..891e8f91d616e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10527,8 +10527,23 @@ with pkgs;
 
   libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5);
 
-  qt5 = qt59;
-  libsForQt5 = libsForQt59;
+  qt510 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.10) {
+      inherit newScope;
+      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      bison = bison2; # error: too few arguments to function 'int yylex(...
+      inherit cups;
+      harfbuzz = harfbuzz-icu;
+      mesa = mesa_noglu;
+      inherit perl;
+      inherit (gst_all_1) gstreamer gst-plugins-base;
+      inherit (gnome3) gtk3 dconf;
+    });
+
+  libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5);
+
+  qt5 = qt510;
+  libsForQt5 = libsForQt510;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
-- 
cgit 1.4.1