From 902c567974a3af0795c2efce369dc0be0edea34b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 19:13:01 +0200 Subject: [PATCH] qutebrowser: use current qt (5.15) again instead of 5.14 For security reasons [1] we upgrade to the latest Qt, despite this breaking a feature, which is why 5.14 was forced earlier. [1] https://github.com/NixOS/nixpkgs/pull/99456#issuecomment-703523943 --- pkgs/top-level/all-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd776fab41..0e383865486 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23025,17 +23025,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = let - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - # Use 5.14 https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; qxw = callPackage ../applications/editors/qxw {};