riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make cgt work a bit more

This commit is contained in:
Las Safin 2021-09-01 17:18:05 +00:00
parent f20ffa02e9
commit 953a98b769
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/crlcore.nix
View File

@ -2,10 +2,10 @@
let pkg = let pkg =
{ lib, libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd { lib, libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd
, coriolis-lefdef, coriolis-hurricane, python2Packages }: , coriolis-lefdef, coriolis-hurricane, python2Packages }:
{ rec {
name = "crlcore"; name = "crlcore";
src = ../crlcore; src = ../crlcore;
buildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-vlsisapd coriolis-hurricane python2Packages.pyqt4 ]; propagatedBuildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-vlsisapd coriolis-hurricane python2Packages.pyqt4 ];
nativeBuildInputs = [ bison flex doxygen python2Packages.pyqt4 ]; nativeBuildInputs = [ bison flex doxygen python2Packages.pyqt4 ];
postInstall = '' postInstall = ''
ln -s crlcore/helpers $out/${python2Packages.python.sitePackages}/helpers ln -s crlcore/helpers $out/${python2Packages.python.sitePackages}/helpers

5
nix/generic.nix
View File

@ -12,6 +12,7 @@ let
, meta ? {} , meta ? {}
, pythonImportsCheck , pythonImportsCheck
, continuation ? (x: x) , continuation ? (x: x)
, postInstall ? ""
, ... , ...
}@args': }@args':
let let
@ -26,11 +27,11 @@ let
python2Packages.pythonImportsCheckHook python2Packages.pythonImportsCheckHook
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;
preInstall = '' postInstall = postInstall + ''
export PYTHONPATH="$out/${python2Packages.python.sitePackages}:$PYTHONPATH" export PYTHONPATH="$out/${python2Packages.python.sitePackages}:$PYTHONPATH"
''; '';
meta = meta // meta'; meta = meta' // meta;
inherit version pythonImportsCheck; inherit version pythonImportsCheck;
} // args); } // args);

2
nix/oroshi.nix
View File

@ -7,7 +7,7 @@ let pkg =
name = "oroshi"; name = "oroshi";
src = ../oroshi; src = ../oroshi;
buildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd qt4 python2Packages.pyqt4 coriolis-vlsisapd qt4 python2Packages.pyqt4
coriolis-crlcore coriolis-hurricane qt4 coriolis-crlcore coriolis-hurricane qt4
python2Packages.numpy python2Packages.numpy

10
nix/unicorn.nix
View File

@ -6,19 +6,23 @@ let pkg =
, coriolis-flute, coriolis-anabatic, coriolis-coloquinte , coriolis-flute, coriolis-anabatic, coriolis-coloquinte
, coriolis-lefdef, coriolis-knik, coriolis-kite , coriolis-lefdef, coriolis-knik, coriolis-kite
, coriolis-katabatic, coriolis-etesian, coriolis-equinox , coriolis-katabatic, coriolis-etesian, coriolis-equinox
, coriolis-solstice, libxml2, doxygen }: , coriolis-solstice, libxml2, doxygen, python2Packages }:
{ {
name = "unicorn"; name = "unicorn";
src = ../unicorn; src = ../unicorn;
buildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-katana qt4 coriolis-flute coriolis-anabatic coriolis-katana qt4 coriolis-flute coriolis-anabatic
coriolis-lefdef libxml2 coriolis-knik coriolis-kite coriolis-lefdef libxml2 coriolis-knik coriolis-kite
coriolis-katabatic coriolis-etesian coriolis-equinox coriolis-katabatic coriolis-etesian coriolis-equinox
coriolis-solstice coriolis-solstice
]; ];
nativeBuildInputs = [ doxygen ]; nativeBuildInputs = [ doxygen python2Packages.wrapPython ];
pythonImportsCheck = [ "Unicorn" ]; pythonImportsCheck = [ "Unicorn" ];
postFixup = ''
wrapPythonPrograms
'';
}; };
in generic pkg in generic pkg