From 2daf5702c6d059976e203f2eab7ccb539dd9274d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 16 Sep 2020 21:00:04 +0200
Subject: [PATCH] qutebrowser: use qt 5.15

Follow-up to a4e50bb197f032ec447a13f56910ff035b32017f.
---
 .../networking/browsers/qutebrowser/default.nix   |  3 ++-
 pkgs/top-level/all-packages.nix                   | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 0e3e7205e1f9..69ca08e990c7 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, python3Packages
+{ stdenv, lib, fetchurl, fetchzip, python3
 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
 , libxslt, gst_all_1 ? null
@@ -10,6 +10,7 @@
 assert withMediaPlayback -> gst_all_1 != null;
 
 let
+  python3Packages = python3.pkgs;
   pdfjs = let
     version = "2.4.456";
   in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 127bf01abd47..e0b3f75d76ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22835,7 +22835,20 @@ in
 
   quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
 
-  qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { };
+  qutebrowser = let
+    libsForQt5 = qt515;
+    qt5 = qt515;
+    python = python3.override {
+      packageOverrides = self: super: {
+        pkgs = pkgs // {
+          inherit libsForQt5 qt5;
+        };
+      };
+      self = python3;
+    };
+  in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { 
+    python3 = python;
+  };
 
   rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};