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 +2028 -184
26 changed files with 2028 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ec8bab25b - Show all commits

3
flake.nix
View File

@@ -187,6 +187,9 @@
# perl-ldap fails cross-compile (Module::Install needs dynamic loading) # perl-ldap fails cross-compile (Module::Install needs dynamic loading)
# 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 []) ++ [
prev.buildPackages.python # opencl_generate_dynamic_loader.py needs python
];
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 []);