diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-02 18:30:35 -0700 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-05 00:55:16 +0000 |
| commit | 91805738371940d2a11fb3bec684634e64ab4c4a (patch) | |
| tree | 019bc2bc50b38ad75f8c958aa054e13bd9eaddfa | |
| parent | 231e60ee5c1b1f1fcbec7f867e3f57731ccc661e (diff) | |
| download | nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar.gz nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar.bz2 nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar.lz nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar.xz nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.tar.zst nixpkgs-91805738371940d2a11fb3bec684634e64ab4c4a.zip | |
qutebrowser: repair vandalism
Our qutebrowser package has been vandalized by various commits, such as c9cc3a2e3eb4661b49176e0c62afd097793c9626 and ad0bbaf1d21f3b5da9c9cf68f0583d487c295782, which made erroneous assertions such as "since qutebrowser 3.0.0 the derivation is only building for qt6." This commit repairs the vandalism.
| -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 |