From 552e54731ab94744b70d462a91e47cc681a203e7 Mon Sep 17 00:00:00 2001
From: Las Safin <me@las.rs>
Date: Fri, 27 Aug 2021 15:16:06 +0000
Subject: [PATCH] katabatic

---
 flake.nix                         |  2 +-
 katabatic/src/CMakeLists.txt      |  1 +
 knik/cmake_modules/FindKNIK.cmake |  2 +-
 nix/katabatic.nix                 | 23 +++++++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 nix/katabatic.nix

diff --git a/flake.nix b/flake.nix
index 40b04727..e090d5a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
       components = [
         "vlsisapd" "lefdef" "bootstrap" "hurricane" "crlcore"
         "cumulus" "flute" "etesian" "anabatic" "coloquinte"
-        "katana" "bora" "equinox" "knik"
+        "katana" "bora" "equinox" "knik" "katabatic"
       ];
 
     in
diff --git a/katabatic/src/CMakeLists.txt b/katabatic/src/CMakeLists.txt
index fc9ac3fa..890d1f9a 100644
--- a/katabatic/src/CMakeLists.txt
+++ b/katabatic/src/CMakeLists.txt
@@ -8,6 +8,7 @@ endif ( CHECK_DETERMINISM )
    include_directories( ${KATABATIC_SOURCE_DIR}/src
                         ${CORIOLIS_INCLUDE_DIR} 
                         ${HURRICANE_INCLUDE_DIR} 
+                        ${KNIK_INCLUDE_DIR} 
                         ${CONFIGURATION_INCLUDE_DIR} 
                         ${Boost_INCLUDE_DIRS}
                         ${QtX_INCLUDE_DIR}
diff --git a/knik/cmake_modules/FindKNIK.cmake b/knik/cmake_modules/FindKNIK.cmake
index f7a3e496..4551267c 100644
--- a/knik/cmake_modules/FindKNIK.cmake
+++ b/knik/cmake_modules/FindKNIK.cmake
@@ -18,7 +18,7 @@ IF(UNIX)
   FIND_PATH(KNIK_INCLUDE_PATH NAMES knik/KnikEngine.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 ${KNIK_INCLUDE_PATH_DESCRIPTION}"
   )
diff --git a/nix/katabatic.nix b/nix/katabatic.nix
new file mode 100644
index 00000000..8a0d2c91
--- /dev/null
+++ b/nix/katabatic.nix
@@ -0,0 +1,23 @@
+{ version, meta }:
+
+{ lib, stdenv, cmake, ninja, python2, boost
+, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
+, coriolis-crlcore, coriolis-flute, coriolis-knik
+, qt4 }:
+
+let boostWithPython = boost.override { enablePython = true; python = python2; }; in
+
+stdenv.mkDerivation {
+  pname = "coriolis-katabatic";
+
+  src = ../katabatic;
+
+  buildInputs = [
+    python2 boostWithPython coriolis-bootstrap
+    coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
+    coriolis-flute coriolis-knik qt4
+  ];
+  nativeBuildInputs = [ cmake ninja ];
+
+  inherit version meta;
+}