cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #63952 from alyssais/gnupg-sks

Browse source 
gnupg: change default keyserver to non-SKS
This commit is contained in:
Alyssa Ross 2019-06-30 21:10:38 +00:00 committed by GitHub
commit fd593be44b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/security/gnupg/22.nix
View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite
, buildPackages
# Each of the dependencies below are optional.
@ -32,8 +32,15 @@ stdenv.mkDerivation rec {
patches = [
./fix-libusb-include-path.patch
(fetchpatch {
url = https://files.gnupg.net/file/data/qmxjhc6kuja3orybj7st/PHID-FILE-vvzlnw36427pdnug2amc/file;
sha256 = "13snxkmlgmvn0rgxh5k2sgxkp5mbxqiznzm45sw649nvs3ccghq8";
})
];
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
postPatch = ''
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \
configure doc/dirmngr.texi doc/gnupg.info-1
'' + stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-(