Commit 435e743c authored by Valentin Reis's avatar Valentin Reis

Application bump.

parent 5248c12a
Pipeline #5207 passed with stage
in 1 second
...@@ -9,4 +9,6 @@ stdenv.mkDerivation { ...@@ -9,4 +9,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig hdf5 hdf5-cpp hdf5-fortran]; nativeBuildInputs = [ cmake pkgconfig hdf5 hdf5-cpp hdf5-fortran];
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ gfortran pkgconfig hdf5 hdf5-cpp hdf5-fortran] ++ (optional nrmSupport libnrm); buildInputs = [ gfortran pkgconfig hdf5 hdf5-cpp hdf5-fortran] ++ (optional nrmSupport libnrm);
NRM_DIR="${libnrm}";
} }
...@@ -10,6 +10,7 @@ stdenv.mkDerivation { ...@@ -10,6 +10,7 @@ stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_C_COMPILER=${mpich2}/bin/mpicc" "-DCMAKE_C_COMPILER=${mpich2}/bin/mpicc"
"-DCMAKE_CXX_COMPILER=${mpich2}/bin/mpic++" "-DCMAKE_CXX_COMPILER=${mpich2}/bin/mpic++"
"-DQMC_OMP=0"
] ++ optionals nrmSupport [ ] ++ optionals nrmSupport [
"-DQMC_INCLUDE=${libnrm}/include/" "-DQMC_INCLUDE=${libnrm}/include/"
"-DQMC_EXTRA_LIBS=${libnrm}/lib/libnrm.so" "-DQMC_EXTRA_LIBS=${libnrm}/lib/libnrm.so"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "43f0178956b04faaa454e43a2ddd2dda8a3ff5de", "rev": "adadaa968398a42afa967f6602307b12c704b9d7",
"sha256": "15r47yyz60f12h3vm310vvp0nli22ckfl809gfr32bg0k6ma4m95", "sha256": "0ldilp4zdjvf5np5g30pxcwgjlggnfp8akm9dnhvq8z6y168mznf",
"url": "https://xgitlab.cels.anl.gov/argo/argotk.git" "url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment