colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: move phog patch to preferences.nix

Browse Source
This commit is contained in:
Colin 2023-08-28 10:08:50 +00:00
parent 8d03881109
commit deaee833cf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlays/cross.nix
View File

@ -1314,8 +1314,6 @@ in {
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
# 2023/07/27: upstreaming is blocked on p11-kit, argyllcms, libavif cross compilation
phoc = mvToNativeInputs [ final.wayland-scanner final.glib ] prev.phoc;
# disable squeekboard because it takes 20 minutes to compile when emulated
phog = prev.phog.override { squeekboard = null; };
phosh = prev.phosh.overrideAttrs (upstream: {
buildInputs = upstream.buildInputs ++ [
final.libadwaita # "plugins/meson.build:41:2: ERROR: Dependency "libadwaita-1" not found, tried pkgconfig"

3
overlays/preferences.nix
View File

@ -19,6 +19,9 @@
# };
});
# disable squeekboard because it takes 20 minutes to compile when emulated
phog = prev.phog.override { squeekboard = null; };
pipewire = super.pipewire.override {
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
# this means we lose firewire support (oh well..?)