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

fix: use python3 + preConfigure symlink for john cross-compile (python not in PATH)

Browse Source
This commit is contained in:
Hermes
2026-06-21 15:12:12 -04:00
parent 3ec8bab25b
commit 16ec40b237
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@@ -188,8 +188,14 @@
# 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.python # opencl_generate_dynamic_loader.py needs python prev.buildPackages.python3 # opencl_generate_dynamic_loader.py needs python3
]; ];
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"
'';
propagatedBuildInputs = builtins.filter propagatedBuildInputs = builtins.filter
(x: x?pname && x.pname != "perl-ldap") (x: x?pname && x.pname != "perl-ldap")
(old.propagatedBuildInputs or []); (old.propagatedBuildInputs or []);