diff options
author | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
commit | bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (patch) | |
tree | c4f1c253bf8cf5fe17612039d2a27acbdacef253 /pkgs/applications/science | |
parent | 921d046537f6d7f0fc0db07b7aa46be7e9df030b (diff) |
lib.makePerlPath -> perlPackages.makePerlPath
Diffstat (limited to 'pkgs/applications/science')
6 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix index 3502ac3e51b7..d2dbcf185330 100644 --- a/pkgs/applications/science/biology/N3/default.nix +++ b/pkgs/applications/science/biology/N3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, - perl, MNI-Perllib, GetoptTabular, + perlPackages, libminc, EBTKS }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc EBTKS ]; - propagatedBuildInputs = [ perl MNI-Perllib GetoptTabular ]; + propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index c04bc84c156d..23182fcadc6b 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools, - makeWrapper, GetoptTabular, MNI-Perllib }: +{ stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools, + makeWrapper }: stdenv.mkDerivation rec { pname = "conglomerate"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc zlib bicpl ]; - propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ]; + propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]); cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index 7ba054a592ea..9e63b92b24ed 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, - perl, GetoptTabular, MNI-Perllib, + perlPackages, libminc, EBTKS }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc EBTKS ]; - propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index c680eda95d2f..033f78609e9a 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, zlib }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }: stdenv.mkDerivation rec { pname = "minc-tools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg zlib ]; - propagatedBuildInputs = [ perl TextFormat ]; + propagatedBuildInputs = with perlPackages; [ perl TextFormat ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index 9084dfb2e1c3..497c39a52a4c 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, - perl, GetoptTabular, MNI-Perllib, + perlPackages, libminc, octave, coreutils, minc_tools }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc ]; - propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib octave coreutils minc_tools ]; + propagatedBuildInputs = (with perlPackages; [ perl GetoptTabular MNI-Perllib ]) ++ [ octave coreutils minc_tools ]; postFixup = '' for p in $out/bin/*; do diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index 076ecd03a1b1..5901b696d642 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: stdenv.mkDerivation rec { pname = "mni_autoreg"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc ]; - propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc |