diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 62bed5a34f0e..f18c55b3d8d6 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,14 +26,14 @@ let stripRoot = false; }; - pname = "qutebrowser"; version = "3.0.2"; in python3.pkgs.buildPythonApplication { - inherit pname version; + pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; + inherit version; src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index df60188800ab..9eba7fae14bf 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -346,6 +346,5 @@ let if stdenv.buildPlatform == stdenv.hostPlatform then bootstrapScope.qttranslations else null; - qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1849c4f85cc6..6d8b4db08f59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35047,6 +35047,10 @@ with pkgs; inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; }; + qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser { + inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; + }; + qxw = callPackage ../applications/editors/qxw { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs { };