From c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f Mon Sep 17 00:00:00 2001 From: Milan Date: Thu, 10 Sep 2020 09:28:30 +0200 Subject: [PATCH] qutebrowser: use qt515 (#97586) --- pkgs/top-level/all-packages.nix | 7 ++++++- pkgs/top-level/python-packages.nix | 7 ++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f254f56027d..ae19e77cadb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22776,7 +22776,12 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { + python3Packages = python3Packages.override { + qt5 = qt515; + libsForQt5 = libsForQt515; + }; + }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71723b1b2d8..610e50fe84d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,16 +9,13 @@ { pkgs , stdenv , python +, qt5 +, libsForQt5 , overrides ? (self: super: {}) }: with pkgs.lib; -let - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; -in - let packages = ( self: