From 0820f8c4f8673c16c8959949ff84d852291d4a6f Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 30 May 2026 15:33:12 +0900 Subject: [PATCH] thunderbird-esr-bin, thunderbird-latest-bin: fix wrapper The wrapper expects `libDir` exists since 1da3ca73732263dc0473f0d64ccdfa810eaa1fac. This patch passes proper `libName` to the wrapper. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e05899ae0e8d..82996d28429a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -228,7 +228,7 @@ let terminal = false; } // ( - if libName == "thunderbird" then + if lib.strings.hasPrefix "thunderbird" libName then { genericName = "Email Client"; comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0e11e21108..591284452c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10044,6 +10044,7 @@ with pkgs; thunderbird-bin = thunderbird-latest-bin; thunderbird-latest-bin = wrapThunderbird thunderbird-latest-bin-unwrapped { pname = "thunderbird-bin"; + libName = "thunderbird-bin-${thunderbird-latest-bin-unwrapped.version}"; }; thunderbird-latest-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin @@ -10052,6 +10053,7 @@ with pkgs; }; thunderbird-esr-bin = wrapThunderbird thunderbird-esr-bin-unwrapped { pname = "thunderbird-esr-bin"; + libName = "thunderbird-bin-${thunderbird-esr-bin-unwrapped.version}"; }; thunderbird-esr-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { generated = import ../applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix;