From a4e50bb197f032ec447a13f56910ff035b32017f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 20:29:23 +0200 Subject: [PATCH] Revert "qutebrowser: use qt515 (#97586)" We are not going to add parameters to `python-packages.nix`. The proper way to do this is override Python, and pass in a custom `pkgs`. This reverts commit c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f. --- pkgs/top-level/all-packages.nix | 7 +------ pkgs/top-level/python-packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1259c07e445..79a134c2d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22829,12 +22829,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { - python3Packages = python3Packages.override { - qt5 = qt515; - libsForQt5 = libsForQt515; - }; - }; + qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09d9f1f53a0..312527a39b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,13 +9,16 @@ { pkgs , stdenv , python -, qt5 -, libsForQt5 , overrides ? (self: super: {}) }: with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: