gortium/infra
1
1
Fork 0
Code Issues 13 Pull Requests 24 Actions Packages Projects 1 Releases Wiki Activity

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
pull from: uconsole-cm5-incremental
merge into: gortium:master
Conversation 0 Commits 160 Files Changed 26 +2033 -184
26 changed files with 2033 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ec9ffe6a9 - Show all commits

11
flake.nix
View File

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