From 658db5ab5830e63f5d8f096d23bc3ab7bd6bc7a3 Mon Sep 17 00:00:00 2001
From: Las Safin <me@las.rs>
Date: Fri, 3 Sep 2021 12:29:44 +0000
Subject: [PATCH] Get further in alliance tests

---
 nix/alliance-check-toolkit.nix | 9 +++++++--
 nix/crlcore.nix                | 1 +
 nix/unicorn.nix                | 6 +++---
 unicorn/CMakeLists.txt         | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nix/alliance-check-toolkit.nix b/nix/alliance-check-toolkit.nix
index 11bb5d3d..9bf47388 100644
--- a/nix/alliance-check-toolkit.nix
+++ b/nix/alliance-check-toolkit.nix
@@ -1,7 +1,12 @@
 { alliance-src, ... }:
 
-{ stdenv, coriolis-unicorn, alliance, yosys }:
-stdenv.mkDerivation {
+{ stdenv, coriolis-unicorn, coriolis-crlcore, python2Packages, alliance, yosys }:
+
+let
+  env = python2Packages.python.buildEnv.override {
+    extraLibs = [ coriolis-unicorn ];
+  };
+in stdenv.mkDerivation {
   pname = "alliance-check-toolkit";
   version = builtins.substring 0 8 alliance-src.lastModifiedDate;
   src = alliance-src;
diff --git a/nix/crlcore.nix b/nix/crlcore.nix
index b422c181..563a7064 100644
--- a/nix/crlcore.nix
+++ b/nix/crlcore.nix
@@ -9,6 +9,7 @@ let pkg =
     nativeBuildInputs = [ bison flex doxygen python2Packages.pyqt4 ];
     postInstall = ''
       ln -s crlcore/helpers $out/${python2Packages.python.sitePackages}/helpers
+      ln -s -t $out/${python2Packages.python.sitePackages} $out/etc/coriolis2/*
 
       # for import check
       mkdir -p /build/coriolistop/etc/coriolis2
diff --git a/nix/unicorn.nix b/nix/unicorn.nix
index 6fa46ae0..9bec4808 100644
--- a/nix/unicorn.nix
+++ b/nix/unicorn.nix
@@ -1,8 +1,8 @@
 { generic, ... }:
 
 let pkg =
-  { coriolis-vlsisapd, coriolis-hurricane
-  , coriolis-crlcore, qt4, coriolis-katana
+  { coriolis-vlsisapd, coriolis-hurricane, coriolis-tutorial
+  , coriolis-crlcore, qt4, coriolis-katana, coriolis-bora
   , coriolis-flute, coriolis-anabatic, coriolis-coloquinte
   , coriolis-lefdef, coriolis-knik, coriolis-kite
   , coriolis-katabatic, coriolis-etesian, coriolis-equinox
@@ -16,7 +16,7 @@ let pkg =
       coriolis-katana qt4 coriolis-flute coriolis-anabatic
       coriolis-lefdef libxml2 coriolis-knik coriolis-kite
       coriolis-katabatic coriolis-etesian coriolis-equinox
-      coriolis-solstice
+      coriolis-solstice coriolis-bora coriolis-tutorial
     ];
     nativeBuildInputs = [ doxygen python2Packages.wrapPython ];
     pythonImportsCheck = [ "Unicorn" ];
diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 1955fa46..4fc442d4 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -32,12 +32,14 @@
  find_package(CORIOLIS           REQUIRED)
  find_package(ANABATIC           REQUIRED)
  find_package(KATANA             REQUIRED)
+ #find_package(BORA               REQUIRED) # FIXME: make FindBORA.cmake
  find_package(ETESIAN            REQUIRED)
  find_package(KNIK               REQUIRED)
  find_package(KATABATIC          REQUIRED)
  find_package(KITE               REQUIRED)
  find_package(EQUINOX            REQUIRED)
  find_package(SOLSTICE           REQUIRED)
+ #find_package(TUTORIAL           REQUIRED) # FIXME: make FindTUTORIAL.cmake
  find_package(Doxygen)
 
  if(WITH_OPENMP)