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 2033 additions and 184 deletions
Showing only changes of commit 8ec9ffe6a9 - Show all commits

View File

@@ -188,13 +188,12 @@
# Strip it from john deps -- the perl scripts that need it are not critical
john = prev.john.overrideAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
prev.buildPackages.python3 # opencl_generate_dynamic_loader.py needs python3
prev.buildPackages.python3 # python3 for opencl_generate_dynamic_loader.py
];
preConfigure = (old.preConfigure or '') + ''
# configure script calls 'python' not 'python3'
mkdir -p "$TMPDIR/bin"
ln -sf "${prev.buildPackages.python3}/bin/python3" "$TMPDIR/bin/python"
export PATH="$TMPDIR/bin:$PATH"
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
'';
propagatedBuildInputs = builtins.filter
(x: x?pname && x.pname != "perl-ldap")