From e673c285e10c4224a70dec8f65981c7ac16685a1 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 Jul 2020 16:17:18 -0400 Subject: [PATCH] conglomerate: update LIBMINC_DIR to reflect libminc CMake changes --- pkgs/applications/science/biology/conglomerate/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 971e2f23055..8fb8e17eef8 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "conglomerate"; - name = "${pname}-2017-09-10"; + version = "unstable-2017-09-10"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ libminc zlib bicpl ]; 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 = '' for p in $out/bin/*; do