public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18650 from Ericson2314/openvpn-pkcs11

Browse Source 
pkcs11-helper: git rev -> 1.11, openvpn w/ pkcs11-helper support
This commit is contained in:
Alexey Shmalko 2016-09-18 14:43:07 +03:00 committed by GitHub
commit 19898d8284
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/pkcs11helper/default.nix
View File

@ -1,22 +1,21 @@
{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }: { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
let
rev = "5d412bad60";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pkcs11-helper-20121123-${rev}"; name = "pkcs11-helper-${version}";
version = "1.11";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; owner = "OpenSC";
name = "${name}.tar.gz"; repo = "pkcs11-helper";
sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; rev = "${name}";
sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q";
}; };
buildInputs = [ pkgconfig openssl autoreconfHook ]; buildInputs = [ pkgconfig openssl autoreconfHook ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
license = with licenses; [ "BSD" gpl2 ]; license = with licenses; [ bsd3 gpl2 ];
description = "Library that simplifies the interaction with PKCS#11 providers"; description = "Library that simplifies the interaction with PKCS#11 providers";
platforms = platforms.unix; platforms = platforms.unix;
}; };

19
pkgs/tools/networking/openvpn/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig }: { stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig
, pkcs11Support ? false, pkcs11helper ? null,
}:
assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib; with stdenv.lib;
@ -13,13 +17,14 @@ stdenv.mkDerivation rec {
patches = optional stdenv.isLinux ./systemd-notify.patch; patches = optional stdenv.isLinux ./systemd-notify.patch;
buildInputs = [ lzo openssl pkgconfig ] buildInputs = [ lzo openssl pkgconfig ]
++ optionals stdenv.isLinux [ pam systemd iproute ]; ++ optionals stdenv.isLinux [ pam systemd iproute ]
++ optional pkcs11Support pkcs11helper;
configureFlags = optionalString stdenv.isLinux '' configureFlags = optionals stdenv.isLinux [
--enable-systemd "--enable-systemd"
--enable-iproute2 "--enable-iproute2"
IPROUTE=${iproute}/sbin/ip "IPROUTE=${iproute}/sbin/ip" ]
''; ++ optional pkcs11Support "--enable-pkcs11";
postInstall = '' postInstall = ''
mkdir -p $out/share/doc/openvpn/examples mkdir -p $out/share/doc/openvpn/examples