diff options
-rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 03b03724aee..200f8e48c7e 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -15,6 +15,7 @@ }: let + isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let version = "3.9.179"; in @@ -50,10 +51,14 @@ python3.pkgs.buildPythonApplication { ]; propagatedBuildInputs = with python3.pkgs; ([ - pyyaml pyqt6-webengine jinja2 pygments + pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 - readability-lxml pykeepass stem + readability-lxml pykeepass + ] ++ lib.optionals ((builtins.tryEval stem.outPath).success) [ + # error: stem-1.8.2 not supported for interpreter python3.11 + stem + ] ++ [ pynacl # extensive ad blocking adblock diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 8a859af37e9..b8ad7685472 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -339,5 +339,6 @@ let finalScope = baseScope.overrideScope(final: prev: { qttranslations = bootstrapScope.qttranslations; + qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope |