conglomerate: update LIBMINC_DIR to reflect libminc CMake changes
This commit is contained in:
parent
44f2bf87d6
commit
e673c285e1
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "conglomerate";
|
pname = "conglomerate";
|
||||||
name = "${pname}-2017-09-10";
|
version = "unstable-2017-09-10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "BIC-MNI";
|
owner = "BIC-MNI";
|
||||||
@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ libminc zlib bicpl ];
|
buildInputs = [ libminc zlib bicpl ];
|
||||||
propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]);
|
propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]);
|
||||||
|
|
||||||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ];
|
cmakeFlags = [
|
||||||
|
"-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||||
|
"-DBICPL_DIR=${bicpl}/lib"
|
||||||
|
];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
for p in $out/bin/*; do
|
for p in $out/bin/*; do
|
||||||
|
Loading…
Reference in New Issue
Block a user