From c2567773ede31c5cfc057bb83b8e91f3a4436ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Nov 2025 22:51:27 -0800 Subject: [PATCH 1/2] qutebrowser: 3.6.1 -> 3.6.2 Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.6.1...v3.6.2 Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.6.2/doc/changelog.asciidoc --- pkgs/by-name/qu/qutebrowser/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index 9d364f64eba3..0757bd74a18a 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -26,15 +26,15 @@ let isQt6 = lib.versions.major qt6Packages.qtbase.version == "6"; pdfjs = let - version = "5.4.296"; + version = "5.4.394"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-UQ7sYOh7s95mfzH2ZbfDyEvUZiXr7MI3u0WY8WNHWv4="; + hash = "sha256-KMpSwF5MmoWdNoIUd4ZOwbJZZmjkid8wUoFKw7XjQFA="; stripRoot = false; }; - version = "3.6.1"; + version = "3.6.2"; in python3.pkgs.buildPythonApplication { @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-9b31UPJzmsGCXmCAIb+8XMEjKnvFIEO0MozWluHYbZA="; + hash = "sha256-GfSkVluSwcCAvLPlW49QLmyWblTrnW9Qgqne0Qy8JJM="; }; # Needs tox From 8f75ca3dcc7fb16ae6b2ff7849fb2b6e0b8ba484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Nov 2025 12:19:48 -0800 Subject: [PATCH 2/2] qutebrowser: fix loading libwayland-client Previously `qutebrowser --version` resulted in Qt Platform: wayland (Error: wayland-client library not found) --- pkgs/by-name/qu/qutebrowser/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index 0757bd74a18a..5dbda57817f2 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -15,6 +15,7 @@ pipewireSupport ? stdenv.hostPlatform.isLinux, pipewire, qt6Packages, + wayland, enableWideVine ? false, widevine-cdm, # can cause issues on some graphics chips @@ -104,6 +105,11 @@ python3.pkgs.buildPythonApplication { '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py + '' + + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform wayland) '' + substituteInPlace qutebrowser/misc/wmname.py \ + --replace-fail '_load_library("wayland-client")' \ + 'ctypes.CDLL("${lib.getLib wayland}/lib/libwayland-client${stdenv.hostPlatform.extensions.sharedLibrary}")' ''; installPhase = ''