nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 04:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251671 from dotlambda/qutebrowser-qt5

Browse Source 
qutebrowser-qt5: replace qt5.qutebrowser
This commit is contained in:
Artturi 2023-11-24 14:30:25 +02:00 committed by GitHub
commit 7cc4f72999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -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=";
};

1
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -375,6 +375,5 @@ let
if stdenv.buildPlatform == stdenv.hostPlatform
then bootstrapScope.qttranslations
else null;
qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { };
});
in finalScope

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };