From c739b09d85d0dab23a9d6ffaef2ec525c28e7086 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 13 May 2019 14:28:31 -0700
Subject: [PATCH] p11-kit: 0.23.14 -> 0.23.15 (#54750)

* p11-kit: 0.23.14 -> 0.23.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/p11-kit/versions

* p11-kit: refactor 0.23.14 -> 0.23.15
+ add upstream patch to avoid breaking Chromium
+ add upstream patch to fix JKS tests
+ refresh meta (homepage, descriptions, license)
---
 .../development/libraries/p11-kit/default.nix | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index e70d20dd93da..28645c545cd7 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/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"
-  ];
+  ]; # TODO: store trust anchors in a directory common to Nix and NixOS
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
 
   installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
 
-  doInstallCheck = false; # probably a bug in this derivation
-  enableParallelBuilding = true;
-
   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;
   };
 }