Skip to content

Commit

Permalink
Update gpg incantations to work with 2.4.1
Browse files Browse the repository at this point in the history
There's some weird new behavior with keyring paths and keyboxd,
so avoid the entire footgun by just explicitly telling it what key to use.
  • Loading branch information
K900 authored and nbp committed May 19, 2023
1 parent c710498 commit e6ca26f
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions firefox-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,9 @@ let
FILE = chksum;
ASC = chksumSig;
} ''
HOME=`mktemp -d`
set -eu
gpg --import < ${pgpKey}
gpgv --keyring=$HOME/.gnupg/pubring.kbx $ASC $FILE
gpg --dearmor < ${pgpKey} > keyring.gpg
gpgv --keyring=./keyring.gpg $ASC $FILE
mkdir $out
'';

Expand Down Expand Up @@ -131,11 +130,10 @@ let
postFetch =
let asc = super.fetchurl { url = info.sig; sha512 = info.sigSha512; }; in ''
: # Authenticity Check
HOME=`mktemp -d`
set -eu
export PATH="$PATH:${self.gnupg}/bin/"
gpg --import < ${pgpKey}
gpgv --keyring=$HOME/.gnupg/pubring.kbx ${asc} $out
gpg --dearmor < ${pgpKey} > keyring.gpg
gpgv --keyring=./keyring.gpg ${asc} $out
'';
};

Expand Down

0 comments on commit e6ca26f

Please sign in to comment.