summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-09 04:48:49 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-10 02:14:29 +0100
commite7fb320d60fd721a07824683b548b586e486c1ca (patch)
tree9ba37cb43c976e9b5efba130fd75b4c7603591c0
parent71ab3109f28e1719119b55f2f8f5e264061a9605 (diff)
downloadnixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar.gz
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar.bz2
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar.lz
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar.xz
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.tar.zst
nixpkgs-e7fb320d60fd721a07824683b548b586e486c1ca.zip
libb2: Use autoreconfHook and build in parallel
-rw-r--r--pkgs/development/libraries/libb2/default.nix21
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index b142a0a4156..a461f5039aa 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libtool
+, pkg-config
+}:
 
 stdenv.mkDerivation rec {
   pname = "libb2";
@@ -7,18 +13,19 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BLAKE2";
     repo = "libb2";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya";
   };
 
-  preConfigure = ''
-    patchShebangs autogen.sh
-    ./autogen.sh
-  '';
+  nativeBuildInputs = [
+    autoreconfHook
+    libtool
+    pkg-config
+  ];
 
   configureFlags = lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes";
 
-  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
+  enableParallelBuilding = true;
 
   doCheck = true;