From 11311072a22fd272ecf0532a147d2c0efb83f4ae Mon Sep 17 00:00:00 2001
From: Las Safin <me@las.rs>
Date: Fri, 27 Aug 2021 19:48:19 +0000
Subject: [PATCH] unicorn

---
 flake.nix                                 |  2 +-
 nix/unicorn.nix                           | 29 +++++++++++++++++++++++
 solstice/cmake_modules/FindSOLSTICE.cmake |  2 +-
 unicorn/CMakeLists.txt                    |  4 ++--
 unicorn/src/CMakeLists.txt                |  8 +++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 nix/unicorn.nix

diff --git a/flake.nix b/flake.nix
index 643c81b1..66401d49 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,7 +38,7 @@
         "cumulus" "flute" "etesian" "anabatic" "coloquinte"
         "katana" "bora" "equinox" "knik" "katabatic" "ispd"
         "karakaze" "kite" "nimbus" "metis" "mauka" "oroshi"
-        "solstice" "stratus1" "tutorial"
+        "solstice" "stratus1" "tutorial" "unicorn"
       ];
 
     in
diff --git a/nix/unicorn.nix b/nix/unicorn.nix
new file mode 100644
index 00000000..95bdfe8d
--- /dev/null
+++ b/nix/unicorn.nix
@@ -0,0 +1,29 @@
+{ version, meta }:
+
+{ lib, stdenv, cmake, ninja, python2, boost
+, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
+, coriolis-crlcore, qt4, coriolis-katana
+, coriolis-flute, coriolis-anabatic, coriolis-coloquinte
+, coriolis-lefdef, coriolis-knik, coriolis-kite
+, coriolis-katabatic, coriolis-etesian, coriolis-equinox
+, coriolis-solstice, libxml2, doxygen }:
+
+let boostWithPython = boost.override { enablePython = true; python = python2; }; in
+
+stdenv.mkDerivation {
+  pname = "coriolis-unicorn";
+
+  src = ../unicorn;
+
+  buildInputs = [
+    python2 boostWithPython coriolis-bootstrap
+    coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
+    coriolis-katana qt4 coriolis-flute coriolis-anabatic
+    coriolis-lefdef libxml2 coriolis-knik coriolis-kite
+    coriolis-katabatic coriolis-etesian coriolis-equinox
+    coriolis-solstice
+  ];
+  nativeBuildInputs = [ cmake ninja doxygen ];
+
+  inherit version meta;
+}
diff --git a/solstice/cmake_modules/FindSOLSTICE.cmake b/solstice/cmake_modules/FindSOLSTICE.cmake
index 1d896f50..afdb640f 100644
--- a/solstice/cmake_modules/FindSOLSTICE.cmake
+++ b/solstice/cmake_modules/FindSOLSTICE.cmake
@@ -15,7 +15,7 @@ IF(UNIX)
   #
   # Look for an installation.
   #
-  FIND_PATH(SOLSTICE_INCLUDE_PATH NAMES solstice/Equi.h PATHS
+  FIND_PATH(SOLSTICE_INCLUDE_PATH NAMES solstice/Brick.h PATHS
     # Look in other places.
     ${CORIOLIS_DIR_SEARCH}
     PATH_SUFFIXES include/coriolis2
diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 590fa7b2..1955fa46 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -36,8 +36,8 @@
  find_package(KNIK               REQUIRED)
  find_package(KATABATIC          REQUIRED)
  find_package(KITE               REQUIRED)
-#find_package(EQUINOX            REQUIRED)
-#find_package(SOLSTICE           REQUIRED)
+ find_package(EQUINOX            REQUIRED)
+ find_package(SOLSTICE           REQUIRED)
  find_package(Doxygen)
 
  if(WITH_OPENMP)
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index fcb98b4b..760afe73 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -3,6 +3,14 @@
 #              include( ${QT_USE_FILE} )
    include_directories( ${UNICORN_SOURCE_DIR}/src
                         ${HURRICANE_INCLUDE_DIR}
+                        ${KNIK_INCLUDE_DIR}
+                        ${KATABATIC_INCLUDE_DIR}
+                        ${SOLSTICE_INCLUDE_DIR}
+                        ${EQUINOX_INCLUDE_DIR}
+                        ${KITE_INCLUDE_DIR}
+                        ${ETESIAN_INCLUDE_DIR}
+                        ${ANABATIC_INCLUDE_DIR}
+                        ${KATANA_INCLUDE_DIR}
                         ${CORIOLIS_INCLUDE_DIR}
                         ${BOOKSHELF_INCLUDE_DIR}
                         ${CONFIGURATION_INCLUDE_DIR}