Compare commits
2 Commits
22e66259f4
...
0cb908d0e5
| Author | SHA1 | Date | |
|---|---|---|---|
| 0cb908d0e5 | |||
| 0a0c40c7c8 |
@ -13,8 +13,6 @@
|
|||||||
, useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
|
, useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
release = rec {
|
release = rec {
|
||||||
version = "1.12.0";
|
version = "1.12.0";
|
||||||
@ -45,8 +43,7 @@ in
|
|||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs --build test/
|
patchShebangs --build test/
|
||||||
'';
|
'';
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ] ++ lib.optionals (useMpi) [ mpi ];
|
||||||
buildInputs = lib.optionals (useMpi) [ mpi ];
|
|
||||||
cmakeBuildType = if (enableDebug) then "Debug" else "Release";
|
cmakeBuildType = if (enableDebug) then "Debug" else "Release";
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DOVNI_GIT_COMMIT=${src.shortRev}"
|
"-DOVNI_GIT_COMMIT=${src.shortRev}"
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
, gnumake
|
, gnumake
|
||||||
, boost
|
, boost
|
||||||
, mpi
|
, mpi
|
||||||
, gcc
|
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, enableOvni ? true
|
, enableOvni ? true
|
||||||
, ovni ? null
|
, ovni ? null
|
||||||
@ -51,7 +50,6 @@ in stdenv.mkDerivation {
|
|||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
gcc
|
|
||||||
gnumake
|
gnumake
|
||||||
libtool
|
libtool
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user