diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-24 14:30:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 14:30:25 +0200 |
| commit | 7cc4f72999fff9c4ee77cf9b568433dcc665316c (patch) | |
| tree | 5770df6ecc5264badf7c176ffd5b5b014dd17a34 | |
| parent | 397d67a60d8de1ec3722e66dbd951452803744b7 (diff) | |
| parent | 4bd758c9634eef2d58822b4aaa424051f613da0d (diff) | |
| download | nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar.gz nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar.bz2 nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar.lz nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar.xz nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.tar.zst nixlib-7cc4f72999fff9c4ee77cf9b568433dcc665316c.zip | |
Merge pull request #251671 from dotlambda/qutebrowser-qt5
qutebrowser-qt5: replace qt5.qutebrowser
| -rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 04de25c4988a..c8b315893a52 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 a2b38046c5a8..68a3e3531e19 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -375,6 +375,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 4da5a8c5b3c9..cd81a00727e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35045,7 +35045,11 @@ with pkgs; }; qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { - inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + }; + + qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser { + inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; }; qxw = callPackage ../applications/editors/qxw { }; |