diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2024-05-13 23:05:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-13 23:05:33 +0200 |
commit | bb740f8ac853a297724d0551bfb38d46583cdc14 (patch) | |
tree | 63e62ecc729b294466122139f718b6d1a0e11831 /pkgs/development/libraries/science | |
parent | 4d50d8dfa8fdea4dc0ff67b3b8cb6c8b9b10d97c (diff) | |
parent | 9ed8eec34677079792dd5a9c0d14cec08e44ce1a (diff) |
Merge pull request #311264 from RaghavSood/bicpl/unstable-2023-01-19
Diffstat (limited to 'pkgs/development/libraries/science')
-rw-r--r-- | pkgs/development/libraries/science/biology/bicpl/default.nix | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index c15689aa606a0..45d1b159d0747 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -1,19 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + libminc, + netpbm, +}: stdenv.mkDerivation rec { pname = "bicpl"; - version = "unstable-2020-10-15"; + version = "unstable-2023-01-19"; - # current master is significantly ahead of most recent release, so use Git version: + # master is not actively maintained, using develop and develop-apple branches src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "a58af912a71a4c62014975b89ef37a8e72de3c9d"; - sha256 = "0iw0pmr8xrifbx5l8a0xidfqbm1v8hwzqrw0lcmimxlzdihyri0g"; + owner = "BIC-MNI"; + repo = pname; + rev = "884b3ac8db945a17df51a325d29f49b825a61c3e"; + hash = "sha256-zAA+hPwjMawQ1rJuv8W30EqKO+AI0aq9ybquBnKlzC0="; }; + patches = [ + # fixes build by including missing time.h header + (fetchpatch { + url = "https://github.com/RaghavSood/bicpl/commit/3def4acd6bae61ff7a930ef8422ad920690382a6.patch"; + hash = "sha256-VdAKuLWTZY7JriK1rexIiuj8y5ToaSEJ5Y+BbnfdYnI="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc netpbm ]; + buildInputs = [ + libminc + netpbm + ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; @@ -25,6 +44,9 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = with licenses; [ hpndUc gpl3Plus ]; + license = with licenses; [ + hpndUc + gpl3Plus + ]; }; } |