diff --git a/equinox/cmake_modules/FindEQUINOX.cmake b/equinox/cmake_modules/FindEQUINOX.cmake index b3cc1867..1e300e35 100644 --- a/equinox/cmake_modules/FindEQUINOX.cmake +++ b/equinox/cmake_modules/FindEQUINOX.cmake @@ -39,8 +39,8 @@ IF(UNIX) DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}" ) - SET_LIBRARIES_PATH(EQUINOX EQUINOX) SET_LIBRARIES_PATH(EQUINOX INTERVALTREE) + SET_LIBRARIES_PATH(EQUINOX EQUINOX) HURRICANE_CHECK_LIBRARIES(EQUINOX) ENDIF(UNIX) diff --git a/flake.nix b/flake.nix index bb6671d8..9fd37764 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ "cumulus" "flute" "etesian" "anabatic" "coloquinte" "katana" "bora" "equinox" "knik" "katabatic" "ispd" "karakaze" "kite" "nimbus" "metis" "mauka" "oroshi" + "solstice" ]; in diff --git a/nix/solstice.nix b/nix/solstice.nix new file mode 100644 index 00000000..0fe42350 --- /dev/null +++ b/nix/solstice.nix @@ -0,0 +1,22 @@ +{ version, meta }: + +{ lib, stdenv, cmake, ninja, python2, qt4, coriolis-crlcore +, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-equinox, boost }: + +let boostWithPython = boost.override { enablePython = true; python = python2; }; in + +stdenv.mkDerivation { + pname = "coriolis-solstice"; + + src = ../solstice; + + buildInputs = [ + python2 coriolis-bootstrap coriolis-vlsisapd + coriolis-crlcore coriolis-hurricane qt4 boostWithPython + coriolis-equinox + ]; + nativeBuildInputs = [ cmake ninja ]; + + inherit version meta; +} diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt index 91c8bca9..62eabe4f 100644 --- a/solstice/CMakeLists.txt +++ b/solstice/CMakeLists.txt @@ -19,6 +19,7 @@ find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) find_package(EQUINOX REQUIRED) - + + add_subdirectory(src) add_subdirectory(cmake_modules) diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt index 2e3fec5f..ab8d8805 100644 --- a/solstice/src/CMakeLists.txt +++ b/solstice/src/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories ( ${SOLSTICE_SOURCE_DIR}/src ${HURRICANE_INCLUDE_DIR} + ${EQUINOX_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} ${QtX_INCLUDE_DIR}