This commit is contained in:
Las Safin 2021-08-29 19:16:28 +00:00
parent 7661abe6e1
commit 7bab1feec5
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
4 changed files with 21 additions and 24 deletions

View File

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

View File

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

View File

@ -1,18 +1,11 @@
{ version, meta }: { generic, ... }:
let pkg =
{ lib, stdenv, cmake, ninja, python2, boost { coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }:
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane {
, coriolis-crlcore }: name = "flute";
src = ../flute;
let boostWithPython = boost.override { enablePython = true; python = python2; }; in buildInputs = [ coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ];
nativeBuildInputs = [ ];
stdenv.mkDerivation { pythonImportsCheck = [ "Flute" ];
pname = "coriolis-flute"; };
in generic pkg
src = ../flute;
buildInputs = [ python2 boostWithPython coriolis-bootstrap coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ];
nativeBuildInputs = [ cmake ninja ];
inherit version meta;
}

View File

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