diff --git a/bora/src/CMakeLists.txt b/bora/src/CMakeLists.txt index 1f7444bc..7be6544f 100644 --- a/bora/src/CMakeLists.txt +++ b/bora/src/CMakeLists.txt @@ -1,6 +1,8 @@ # -*- explicit-buffer-name: "CMakeLists.txt" -*- include_directories( ${BORA_SOURCE_DIR}/src + ${ANABATIC_INCLUDE_DIR} + ${KATANA_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} diff --git a/flake.nix b/flake.nix index 33a12077..08a1568e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ components = [ "vlsisapd" "lefdef" "bootstrap" "hurricane" "crlcore" "cumulus" "flute" "etesian" "anabatic" "coloquinte" - "katana" + "katana" "bora" ]; in diff --git a/katana/cmake_modules/FindKATANA.cmake b/katana/cmake_modules/FindKATANA.cmake index 0b579749..1243f0d5 100644 --- a/katana/cmake_modules/FindKATANA.cmake +++ b/katana/cmake_modules/FindKATANA.cmake @@ -18,7 +18,7 @@ IF(UNIX) FIND_PATH(KATANA_INCLUDE_PATH NAMES katana/KatanaEngine.h PATHS # Look in other places. ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES include/coriolis + PATH_SUFFIXES include/coriolis2 # Help the user find it if we cannot. DOC "The ${KATANA_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/nix/bora.nix b/nix/bora.nix new file mode 100644 index 00000000..f8907bb2 --- /dev/null +++ b/nix/bora.nix @@ -0,0 +1,25 @@ +{ version, meta }: + +{ lib, stdenv, cmake, ninja, python2, boost +, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-crlcore, qt4, coriolis-katana +, coriolis-flute, coriolis-anabatic +, coriolis-lefdef, qwt6_qt4 }: + +let boostWithPython = boost.override { enablePython = true; python = python2; }; in + +stdenv.mkDerivation { + pname = "coriolis-bora"; + + src = ../bora; + + buildInputs = [ + python2 boostWithPython coriolis-bootstrap + coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-katana qt4 coriolis-flute coriolis-anabatic + coriolis-lefdef qwt6_qt4 + ]; + nativeBuildInputs = [ cmake ninja ]; + + inherit version meta; +}