Merge pull request #119726 from prusnak/oobicpl

oobicpl: unstable-2016-03-02 -> unstable-2020-08-12
This commit is contained in:
Pavol Rusnak 2021-04-17 19:42:52 +02:00 committed by GitHub
commit c27aea5e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 19 deletions

View File

@ -2,16 +2,14 @@
stdenv.mkDerivation rec {
pname = "bicpl";
version = "unstable-2017-09-10";
owner = "BIC-MNI";
version = "unstable-2020-10-15";
# current master is significantly ahead of most recent release, so use Git version:
src = fetchFromGitHub {
inherit owner;
owner = "BIC-MNI";
repo = pname;
rev = "612a63e740fadb162fcf27ee00da6a18dec4d5a9";
sha256 = "1vv9gi184bkvp3f99v9xmmw1ly63ip5b09y7zdjn39g7kmwzrga7";
rev = "a58af912a71a4c62014975b89ef37a8e72de3c9d";
sha256 = "0iw0pmr8xrifbx5l8a0xidfqbm1v8hwzqrw0lcmimxlzdihyri0g";
};
nativeBuildInputs = [ cmake ];
@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
# internal_volume_io.h: No such file or directory
meta = with lib; {
homepage = "https://github.com/${owner}/${pname}";
homepage = "https://github.com/BIC-MNI/bicpl";
description = "Brain Imaging Centre programming library";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;

View File

@ -1,28 +1,36 @@
{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libminc
, bicpl
, arguments
, pcre-cpp }:
stdenv.mkDerivation rec {
pname = "oobicpl";
version = "unstable-2016-03-02";
owner = "BIC-MNI";
version = "unstable-2020-08-12";
src = fetchFromGitHub {
inherit owner;
owner = "BIC-MNI";
repo = pname;
rev = "bc062a65dead2e58461f5afb37abedfa6173f10c";
sha256 = "05l4ml9djw17bgdnrldhcxydrzkr2f2scqlyak52ph5azj5n4zsx";
rev = "a9409da8a5bb4925438f32aff577b6333faec28b";
sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libminc bicpl arguments pcre-cpp ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DBICPL_DIR=${bicpl}/lib"
"-DARGUMENTS_DIR=${arguments}/lib"
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ];
cmakeFlags = [
"-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DBICPL_DIR=${bicpl}/lib"
"-DARGUMENTS_DIR=${arguments}/lib"
"-DOOBICPL_BUILD_SHARED_LIBS=TRUE"
];
meta = with lib; {
homepage = "https://github.com/${owner}/${pname}";
homepage = "https://github.com/BIC-MNI/oobicpl";
description = "Brain Imaging Centre object-oriented programming library (and tools)";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;