From c4919b614e4ab8e0ceaf69496d915ac85a9f5066 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 24 Apr 2019 11:53:09 +0800
Subject: [PATCH] libp11: 0.4.9 -> 0.4.10

The build was broken as the output was nested inside /nix/store so fix that as
well. We didn't know as no other derivation was using it.
---
 pkgs/development/libraries/libp11/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index cb675f4d3e58..774019de0d5b 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig
+, openssl }:
 
 stdenv.mkDerivation rec {
   name = "libp11-${version}";
-  version = "0.4.9";
+  version = "0.4.10";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
     rev = name;
-    sha256 = "1f0ir1mnr4wxxnql8ld2aa6288fn04fai5pr0sics7kbdm1g0cki";
+    sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
   };
 
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+  configureFlags = [
+    "--with-enginesdir=${placeholder "out"}/lib/engines"
+  ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+
   buildInputs = [ openssl ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
+    description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
     homepage = https://github.com/OpenSC/libp11;
     license = licenses.lgpl21Plus;
-    description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
     platforms = platforms.all;
   };
 }