Try to get crlcore working
This commit is contained in:
parent
c7df1e6ac9
commit
7661abe6e1
|
@ -70,7 +70,7 @@
|
|||
let
|
||||
pkgs = nixpkgsFor.${system};
|
||||
env = pkgs.python2.buildEnv.override {
|
||||
extraLibs = [ pkgs.coriolis-vlsisapd ];
|
||||
extraLibs = builtins.map (x: pkgs.${"coriolis-${x}"}) [ "vlsisapd" "hurricane" "crlcore" ];
|
||||
};
|
||||
in env.env
|
||||
);
|
||||
|
|
|
@ -1,21 +1,12 @@
|
|||
{ version, meta }:
|
||||
|
||||
{ lib, stdenv, python2, cmake, boost, bison, flex, libxml2, qt4, ninja
|
||||
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
|
||||
, coriolis-lefdef, doxygen }:
|
||||
|
||||
let boostWithPython = boost.override { enablePython = true; python = python2; }; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "coriolis-crlcore";
|
||||
|
||||
src = ../crlcore;
|
||||
|
||||
buildInputs = [
|
||||
python2 boostWithPython coriolis-bootstrap coriolis-lefdef
|
||||
coriolis-hurricane coriolis-vlsisapd libxml2 bison flex qt4
|
||||
];
|
||||
nativeBuildInputs = [ cmake ninja doxygen ];
|
||||
|
||||
inherit version meta;
|
||||
}
|
||||
{ version, meta, generic, ... }:
|
||||
let pkg =
|
||||
{ libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd
|
||||
, coriolis-lefdef, coriolis-hurricane }:
|
||||
{
|
||||
name = "crlcore";
|
||||
src = ../crlcore;
|
||||
buildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-vlsisapd coriolis-hurricane ];
|
||||
nativeBuildInputs = [ bison flex doxygen ];
|
||||
pythonImportsCheck = [ "CRL" "Constant" ];
|
||||
};
|
||||
in generic pkg
|
||||
|
|
|
@ -14,8 +14,11 @@ let f =
|
|||
drv = stdenv.mkDerivation {
|
||||
pname = "coriolis-${name}";
|
||||
|
||||
buildInputs = [ python2Packages.python boostWithPython coriolis-bootstrap ] ++ buildInputs;
|
||||
nativeBuildInputs = [ cmake ninja python2Packages.pythonImportsCheckHook ] ++ nativeBuildInputs;
|
||||
buildInputs = [ python2Packages.python boostWithPython ] ++ buildInputs;
|
||||
nativeBuildInputs = [
|
||||
coriolis-bootstrap cmake ninja
|
||||
python2Packages.pythonImportsCheckHook
|
||||
] ++ nativeBuildInputs;
|
||||
|
||||
preInstall = ''
|
||||
export PYTHONPATH="$out/${python2Packages.python.sitePackages}:$PYTHONPATH"
|
||||
|
|
Loading…
Reference in New Issue