diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/p11-kit | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/p11-kit')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/p11-kit/default.nix | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index e70d20dd93da..0e1be8633468 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv -, libffi, libtasn1 }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which +, gettext, libffi, libiconv, libtasn1 +}: stdenv.mkDerivation rec { - name = "p11-kit-${version}"; - version = "0.23.14"; + pname = "p11-kit"; + version = "0.23.15"; src = fetchFromGitHub { owner = "p11-glue"; - repo = "p11-kit"; + repo = pname; rev = version; - sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; + sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv"; }; + patches = [ + (fetchpatch { + # https://github.com/p11-glue/p11-kit/issues/212 + url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch"; + sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg"; + }) + (fetchpatch { + # https://github.com/p11-glue/p11-kit/issues/220 + url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch"; + sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7"; + }) + ]; + outputs = [ "out" "dev"]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook which pkgconfig ]; - buildInputs = [ libffi libtasn1 libiconv ]; + nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' NOCONFIGURE=1 ./autogen.sh @@ -26,16 +40,23 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" - ]; - - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + ]; # TODO: store trust anchors in a directory common to Nix and NixOS - doInstallCheck = false; # probably a bug in this derivation enableParallelBuilding = true; + doCheck = !stdenv.isDarwin; + + installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + meta = with stdenv.lib; { - homepage = https://p11-glue.freedesktop.org/; + description = "Library for loading and sharing PKCS#11 modules"; + longDescription = '' + Provides a way to load and enumerate PKCS#11 modules. + Provides a standard configuration setup for installing + PKCS#11 modules in such a way that they're discoverable. + ''; + homepage = https://p11-glue.github.io/p11-glue/p11-kit.html; platforms = platforms.all; - license = licenses.mit; + license = licenses.bsd3; }; } |