diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/development/libraries/science/biology | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science/biology')
3 files changed, 12 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 4cfc07c1cbaa..e5565aae29b1 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python }: +{ stdenv, fetchFromGitHub, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -10,11 +10,18 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; - nativeBuildInputs = [ cmake python ]; + + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; + doCheck = true; + + preCheck = " + export LD_LIBRARY_PATH=$(pwd)/bin + "; + meta = with stdenv.lib; { - homepage = http://elastix.isi.uu.nl/; + homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index cdd56731fa0e..7ee63e9bb413 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix index 8c7da7968f5c..37055259e7c8 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 7 out of 293 tests meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/niftilib; + homepage = "https://sourceforge.net/projects/niftilib"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; |