From 4e5e1578fe2f3fbfae45cea85782ef25db14df43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Nov 2023 16:40:16 -0800 Subject: [PATCH 1/2] qutebrowser: add meta attributes --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 62bed5a34f0e..14d6edcda4f1 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -125,8 +125,10 @@ python3.pkgs.buildPythonApplication { meta = with lib; { homepage = "https://github.com/qutebrowser/qutebrowser"; + changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; + mainProgram = "qutebrowser"; platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ]; }; From 2c6991d11948fccf536d56cfd915899e53808d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Nov 2023 16:39:08 -0800 Subject: [PATCH 2/2] qutebrowser: cleanup --- .../networking/browsers/qutebrowser/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 14d6edcda4f1..9c56894a2f97 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,7 +12,6 @@ , widevine-cdm , enableVulkan ? stdenv.isLinux , vulkan-loader -, buildPackages }: let @@ -56,10 +55,7 @@ python3.pkgs.buildPythonApplication { # scripts and userscripts libs tldextract beautifulsoup4 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 @@ -86,7 +82,7 @@ python3.pkgs.buildPythonApplication { runHook preInstall make -f misc/Makefile \ - PYTHON=${buildPackages.python3}/bin/python3 \ + PYTHON=${python3.pythonOnBuildForHost.interpreter} \ PREFIX=. \ DESTDIR="$out" \ DATAROOTDIR=/share \