From c7df1e6ac9e64942bf682417b308cc0e914480f5 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Sun, 29 Aug 2021 17:46:28 +0000 Subject: [PATCH] hurricane --- nix/hurricane.nix | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/nix/hurricane.nix b/nix/hurricane.nix index 63a4c97d..5aebcf6e 100644 --- a/nix/hurricane.nix +++ b/nix/hurricane.nix @@ -1,18 +1,12 @@ -{ version, meta }: +{ version, meta, generic, ... }: -{ lib, stdenv, python2, cmake, boost, bison, flex -, libxml2, rapidjson, qt4, zlib, bzip2, ninja -, coriolis-bootstrap, coriolis-vlsisapd, doxygen }: - -let boostWithPython = boost.override { enablePython = true; python = python2; }; in - -stdenv.mkDerivation { - pname = "coriolis-hurricane"; - - src = ../hurricane; - - buildInputs = [ python2 boostWithPython coriolis-bootstrap libxml2 bison flex qt4 bzip2 coriolis-vlsisapd rapidjson ]; - nativeBuildInputs = [ cmake ninja doxygen ]; - - inherit version meta; -} +let pkg = + { libxml2, bzip2, rapidjson, qt4, bison, flex, doxygen, coriolis-vlsisapd }: + { + name = "hurricane"; + src = ../hurricane; + buildInputs = [ libxml2 qt4 bzip2 rapidjson coriolis-vlsisapd ]; + nativeBuildInputs = [ bison flex doxygen ]; + pythonImportsCheck = [ "Viewer" "Hurricane" "Cfg2" "Analog" ]; + }; +in generic pkg