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 +504 -52
10 changed files with 504 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2476352fdf - Show all commits

9
flake.nix
View File

@@ -120,12 +120,9 @@
gjs = prev.gjs.overrideAttrs (old: { gjs = prev.gjs.overrideAttrs (old: {
mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ]; mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
}); });
# hyprland-qt-support: Qt6Qml cross-compile path mismatch # Qt6Quick missing from aarch64 qtdeclarative cross-compile;
hyprland-qt-support = prev.hyprland-qt-support.overrideAttrs (old: { # skip qtutils runtime deps — Hyprland only needs it for QML UI
cmakeFlags = (old.cmakeFlags or []) ++ [ hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
"-DQt6Qml_DIR=${prev.qt6.qtdeclarative}/lib/cmake/Qt6Qml"
];
});
}) })
]; ];
} }