Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16fd4233de22
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1cb4bfbb316
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 1, 2021

  1. thunderbird: Add gpg/gpgme dependencies. Fixes #98765. 

    This enables to configure Thunderbird to use gnupg directly, which is the
official upstream recommendation when using GPG with smartcards, which are not
yet supported by Thunderbird's native GPG support.

(cherry picked from commit 2767936)
    @nh2
    nh2 committed Jan 1, 2021
    Copy the full SHA
    8c2bcac View commit details

  2. thunderbird-bin: Add gpg/gpgme dependencies. Fixes #98765 

    (cherry picked from commit e72bd9f)
    @nh2
    nh2 committed Jan 1, 2021
    Copy the full SHA
    64037af View commit details

  3. Merge pull request #108157 from nh2/thunderbird-gpgme-20.09 

    [20.09] thunderbird: Add gpg/gpgme dependencies to fix smartcard usage
    @lovesegfault
    lovesegfault authored Jan 1, 2021
    Copy the full SHA
    e1cb4bf View commit details
Showing with 20 additions and 1 deletion.
  1. +7 −1 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
  2. +13 −0 pkgs/applications/networking/mailreaders/thunderbird/default.nix
8 changes: 7 additions & 1 deletion pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@
, gnused
, gnugrep
, gnupg
, gpgme
, runtimeShell
}:

@@ -118,6 +119,9 @@ stdenv.mkDerivation {

nativeBuildInputs = [ makeWrapper ];

# See "Note on GPG support" in `../thunderbird/default.nix` for explanations
# on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH.

installPhase =
''
mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
@@ -158,7 +162,9 @@ stdenv.mkDerivation {
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
--set SNAP_NAME "thunderbird" \
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1
--set MOZ_ALLOW_DOWNGRADE 1 \
--prefix PATH : "${stdenv.lib.getBin gnupg}/bin" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib gpgme}/lib"
'';

passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
13 changes: 13 additions & 0 deletions pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
, glib
, gnugrep
, gnused
, gnupg
, gpgme
, icu
, jemalloc
, lib
@@ -286,6 +288,15 @@ stdenv.mkDerivation rec {
${desktopItem.buildCommand}
'';

# Note on GPG support:
# Thunderbird's native GPG support does not yet support smartcards.
# The official upstream recommendation is to configure fall back to gnupg
# using the Thunderbird config `mail.openpgp.allow_external_gnupg`
# and GPG keys set up; instructions with pictures at:
# https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/
# For that to work out of the box, it requires `gnupg` on PATH and
# `gpgme` in `LD_LIBRARY_PATH`; we do this below.

preFixup = ''
# Needed to find Mozilla runtime
gappsWrapperArgs+=(
@@ -295,6 +306,8 @@ stdenv.mkDerivation rec {
--set SNAP_NAME "thunderbird"
--set MOZ_LEGACY_PROFILES 1
--set MOZ_ALLOW_DOWNGRADE 1
--prefix PATH : "${lib.getBin gnupg}/bin"
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
)
'';