summary refs log tree commit diff
path: root/pkgs/development/libraries/libp11
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2019-04-24 11:53:09 +0800
committerPeter Hoeg <peter@hoeg.com>2019-04-24 11:53:09 +0800
commitc4919b614e4ab8e0ceaf69496d915ac85a9f5066 (patch)
tree6c8da36017b8a1a3cd4ca71c0ec3ede564f1c97f /pkgs/development/libraries/libp11
parentd26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff)
downloadnixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar.gz
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar.bz2
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar.lz
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar.xz
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.tar.zst
nixpkgs-c4919b614e4ab8e0ceaf69496d915ac85a9f5066.zip
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.
Diffstat (limited to 'pkgs/development/libraries/libp11')
-rw-r--r--pkgs/development/libraries/libp11/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index cb675f4d3e5..774019de0d5 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;
   };
 }