From fd55e99a7ce82c6c15ad0c6882cbf850edc08a81 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Fri, 3 Sep 2021 13:33:48 +0000 Subject: [PATCH] fix karakaze --- karakaze/CMakeLists.txt | 4 +++- nix/karakaze.nix | 35 ++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/karakaze/CMakeLists.txt b/karakaze/CMakeLists.txt index 7b4eb782..2652ca00 100644 --- a/karakaze/CMakeLists.txt +++ b/karakaze/CMakeLists.txt @@ -14,11 +14,13 @@ check_distribution() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - setup_qt() find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) + find_package(KATANA REQUIRED) + find_package(ANABATIC REQUIRED) + #find_package(BORA REQUIRED) # FIXME #add_subdirectory(src) add_subdirectory(python) diff --git a/nix/karakaze.nix b/nix/karakaze.nix index 19b0df6b..cdc24186 100644 --- a/nix/karakaze.nix +++ b/nix/karakaze.nix @@ -1,18 +1,23 @@ -{ version, meta }: +{ generic, ... }: -{ lib, stdenv, cmake, ninja, python2, qt4, coriolis-crlcore -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane }: +let pkg = + { lib, coriolis-crlcore, coriolis-bora, coriolis-katana, coriolis-anabatic + , coriolis-vlsisapd, coriolis-hurricane }: + { + name = "coriolis-karakaze"; + src = ../karakaze; -stdenv.mkDerivation { - pname = "coriolis-karakaze"; + propagatedBuildInputs = [ + coriolis-vlsisapd coriolis-crlcore coriolis-hurricane coriolis-katana + coriolis-bora coriolis-anabatic + ]; + postInstall = '' + # for import check + mkdir -p /build/coriolistop/etc/coriolis2 + export CORIOLIS_TOP=/build/coriolistop + ''; + pythonImportsCheck = [ "karakaze" "karakaze.analogdesign" ]; - src = ../karakaze; - - buildInputs = [ - python2 coriolis-bootstrap coriolis-vlsisapd - coriolis-crlcore coriolis-hurricane qt4 - ]; - nativeBuildInputs = [ cmake ninja ]; - - inherit version meta; -} + meta.license = lib.licenses.gpl2Plus; + }; +in generic pkg