flute

flake.nix

@@ -37,9 +37,13 @@
 
       # not generic: solstice lefdef equinox knik coloquinte bootstrap
 
-      components = [
-        "vlsisapd" "lefdef" "bootstrap" "hurricane" "crlcore"
-        "cumulus" "flute" "etesian" "anabatic" "coloquinte"
+      pythonComponents = [
+        "vlsisapd" "hurricane" "crlcore" "flute"
+      ];
+
+      components = pythonComponents ++ [
+        "lefdef" "bootstrap"
+        "cumulus" "etesian" "anabatic" "coloquinte"
         "katana" "bora" "equinox" "knik" "katabatic" "ispd"
         "karakaze" "kite" "nimbus" "metis" "mauka" "oroshi"
         "solstice" "stratus1" "tutorial" "unicorn" "documentation"
@@ -70,7 +74,7 @@
         let
           pkgs = nixpkgsFor.${system};
           env = pkgs.python2.buildEnv.override {
-            extraLibs = builtins.map (x: pkgs.${"coriolis-${x}"}) [ "vlsisapd" "hurricane" "crlcore" ];
+            extraLibs = builtins.map (x: pkgs.${"coriolis-${x}"}) pythonComponents;
           };
         in env.env
       );

nix/crlcore.nix

@@ -1,4 +1,4 @@
-{ version, meta, generic, ... }:
+{ generic, ... }:
 let pkg =
   { libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd
   , coriolis-lefdef, coriolis-hurricane }:

nix/flute.nix

@@ -1,18 +1,11 @@
-{ 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;
-
-  buildInputs = [ python2 boostWithPython coriolis-bootstrap coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ];
-  nativeBuildInputs = [ cmake ninja ];
-
-  inherit version meta;
-}
+{ generic, ... }:
+let pkg =
+  { coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }:
+  {
+    name = "flute";
+    src = ../flute;
+    buildInputs = [ coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ];
+    nativeBuildInputs = [ ];
+    pythonImportsCheck = [ "Flute" ];
+  };
+in generic pkg

nix/vlsisapd.nix

@@ -1,4 +1,4 @@
-{ version, meta, generic, ... }:
+{ generic, ... }:
 let pkg =
   { libxml2, qt4, bison, flex, doxygen }:
   {