Merge pull request #61739 from Lassulus/openvpn

openvpn: fix pkcs11 helper
This commit is contained in:
John Ericson 2019-05-20 12:37:43 -04:00 committed by GitHub
commit c00a043ce2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, fetchpatch, pkgconfig
, iproute, lzo, openssl, pam
, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null
, pkcs11Support ? false, pkcs11helper ? null,
@ -33,6 +33,13 @@ in stdenv.mkDerivation rec {
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper;
patches = [
( fetchpatch {
url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch";
sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm";
})
];
configureFlags = optionals stdenv.isLinux [
"--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" ]