diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-09-13 06:24:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-13 06:24:00 -0500 |
| commit | 48780fa239c4f935f23f7b079ca62a761f5fa1d1 (patch) | |
| tree | 58678dc33236068695b2805c05dc7cb6dd7fc0f4 /pkgs/applications/science | |
| parent | 0a82b0a1cd4cc94df979770bb178ae9fb02cb407 (diff) | |
| parent | f434e83d62f8cc887309670ae551f24fec95611b (diff) | |
Merge pull request #250309 from trofi/angsd-fix-parallel
angsd: pull patch pending upstream inclusion for parallel build fix
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/angsd/default.nix | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix index 035cb2ca2b275..71366dc0d3648 100644 --- a/pkgs/applications/science/biology/angsd/default.nix +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, htslib +, zlib +, bzip2 +, xz +, curl +, openssl +}: stdenv.mkDerivation rec { pname = "angsd"; @@ -11,8 +21,20 @@ stdenv.mkDerivation rec { rev = version; }; + patches = [ + # Pull pending inclusion upstream patch for parallel buil fixes: + # https://github.com/ANGSD/angsd/pull/590 + (fetchpatch { + name = "parallel-make.patch"; + url = "https://github.com/ANGSD/angsd/commit/89fd1d898078016df390e07e25b8a3eeadcedf43.patch"; + hash = "sha256-KQgUfr3v8xc+opAm4qcSV2eaupztv4gzJJHyzJBCxqA="; + }) + ]; + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + enableParallelBuilding = true; + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; meta = with lib; { |