its time to merge to master... its too big now xD #76

Open
gortium wants to merge 160 commits from uconsole-cm5-incremental into master
26 changed files with 2031 additions and 184 deletions
Showing only changes of commit 3778069baf - Show all commits

View File

@@ -190,11 +190,9 @@
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
prev.buildPackages.python3 # python3 for opencl_generate_dynamic_loader.py
];
preConfigure = (old.preConfigure or "") + '''
mkdir -p /tmp/jh-python
ln -sf ${prev.buildPackages.python3}/bin/python3 /tmp/jh-python/python
export PATH=/tmp/jh-python:$PATH
'';
configureFlags = (old.configureFlags or []) ++ [
"ac_cv_prog_PYTHON=${prev.buildPackages.python3}/bin/python3"
];
propagatedBuildInputs = builtins.filter
(x: x?pname && x.pname != "perl-ldap")
(old.propagatedBuildInputs or []);