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
25 changed files with 1620 additions and 181 deletions
Showing only changes of commit 16b9b1c866 - Show all commits

View File

@@ -82,13 +82,12 @@
'';
});
emacs-pgtk = prev.emacs-pgtk.override { withMailutils = false; };
# qtquick3d: Qt::Quick not available in aarch64 cross-compile qtdeclarative
# Make it a no-op so qtmultimedia / wireshark / js8call still build
# qtquick3d: Qt::Quick not in aarch64 cross-compile qtdeclarative
# cmake skips building when Qt::Quick missing, then install fails
qtquick3d = prev.qtquick3d.overrideAttrs (old: {
dontUseCmakeInstall = true;
installPhase = ''
runHook preInstall
cmake --install . --prefix "$out" 2>/dev/null || mkdir -p "$out"
runHook postInstall
mkdir -p "$out"
'';
});
# perl-ldap fails cross-compile (Module::Install needs dynamic loading)