Merge pull request #63952 from alyssais/gnupg-sks
gnupg: change default keyserver to non-SKS
This commit is contained in:
commit
fd593be44b
|
@ -1,5 +1,5 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
|
{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
|
||||||
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
|
, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
|
||||||
# Each of the dependencies below are optional.
|
# Each of the dependencies below are optional.
|
||||||
|
@ -32,8 +32,15 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./fix-libusb-include-path.patch
|
./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
|
sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
|
||||||
''; #" fix Emacs syntax highlighting :-(
|
''; #" fix Emacs syntax highlighting :-(
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue