From a5187f34b92a6921ea2f82726440139f6fb0f167 Mon Sep 17 00:00:00 2001
From: Las Safin <me@las.rs>
Date: Thu, 26 Aug 2021 16:44:45 +0000
Subject: [PATCH] flute

---
 flake.nix                    |  2 +-
 flute/src/3.1/CMakeLists.txt |  2 +-
 nix/crlcore.nix              |  3 +--
 nix/flute.nix                | 28 ++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 nix/flute.nix

diff --git a/flake.nix b/flake.nix
index 65b23603..f37da1d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,7 @@
         platforms   = platforms.all;
       };
 
-      components = [ "vlsisapd" "lefdef" "bootstrap" "hurricane" "crlcore" "cumulus" ];
+      components = [ "vlsisapd" "lefdef" "bootstrap" "hurricane" "crlcore" "cumulus" "flute" ];
 
     in
 
diff --git a/flute/src/3.1/CMakeLists.txt b/flute/src/3.1/CMakeLists.txt
index 8609ce4f..79f0a9c0 100644
--- a/flute/src/3.1/CMakeLists.txt
+++ b/flute/src/3.1/CMakeLists.txt
@@ -1,7 +1,7 @@
 # -*- mode: CMAKE explicit-buffer-name: "CMakeLists.txt<flute/src/3.1>" -*-
 
    include_directories( ${FLUTE_SOURCE_DIR}/src/3.1
-                        ${CORIOLIS_LIBRARIES}
+                        ${CRLCORE_INCLUDE_PATH}
                         ${HURRICANE_INCLUDE_DIR}
                         ${CONFIGURATION_INCLUDE_DIR} 
                         ${PYTHON_INCLUDE_PATH}
diff --git a/nix/crlcore.nix b/nix/crlcore.nix
index 9eef5268..ea34db99 100644
--- a/nix/crlcore.nix
+++ b/nix/crlcore.nix
@@ -1,7 +1,6 @@
 { version, meta }:
 
-{ lib, stdenv, python2, cmake, boost, bison, flex
-, libxml2, rapidjson, qt4, zlib, bzip2, ninja
+{ lib, stdenv, python2, cmake, boost, bison, flex, libxml2, qt4, ninja
 , coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
 , coriolis-lefdef }:
 
diff --git a/nix/flute.nix b/nix/flute.nix
new file mode 100644
index 00000000..0d398ff0
--- /dev/null
+++ b/nix/flute.nix
@@ -0,0 +1,28 @@
+{ version, meta }:
+
+{ lib, stdenv, cmake, ninja, python2, boost
+, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
+, coriolis-crlcore }:
+
+let boostWithPython = boost.override { enablePython = true; python = python2; }; in
+
+stdenv.mkDerivation {
+  pname = "coriolis-flute";
+
+  src = ../flute;
+
+  cmakeFlags = [
+    (
+      "-DCMAKE_MODULE_PATH="
+        + "${coriolis-bootstrap}/share/cmake/Modules"
+        + ";${coriolis-vlsisapd}/share/cmake/Modules"
+        + ";${coriolis-hurricane}/share/cmake/Modules"
+        + ";${coriolis-crlcore}/share/cmake/Modules"
+    )
+  ];
+
+  buildInputs = [ python2 boostWithPython coriolis-bootstrap coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ];
+  nativeBuildInputs = [ cmake ninja ];
+
+  inherit version meta;
+}