Merge pull request #265757 from dotlambda/qutebrowser-cleanup

qutebrowser: cleanup
NixOS · Nov 7, 2023 · 8517efc · 8517efc
2 parents ef13904 + 2c6991d
commit 8517efc
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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 \
@@ -125,8 +121,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 ];
   };