cross: move phog patch to preferences.nix
This commit is contained in:
parent
8d03881109
commit
deaee833cf
|
@ -1314,8 +1314,6 @@ in {
|
||||||
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
|
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
|
||||||
# 2023/07/27: upstreaming is blocked on p11-kit, argyllcms, libavif cross compilation
|
# 2023/07/27: upstreaming is blocked on p11-kit, argyllcms, libavif cross compilation
|
||||||
phoc = mvToNativeInputs [ final.wayland-scanner final.glib ] prev.phoc;
|
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: {
|
phosh = prev.phosh.overrideAttrs (upstream: {
|
||||||
buildInputs = upstream.buildInputs ++ [
|
buildInputs = upstream.buildInputs ++ [
|
||||||
final.libadwaita # "plugins/meson.build:41:2: ERROR: Dependency "libadwaita-1" not found, tried pkgconfig"
|
final.libadwaita # "plugins/meson.build:41:2: ERROR: Dependency "libadwaita-1" not found, tried pkgconfig"
|
||||||
|
|
|
@ -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 {
|
pipewire = super.pipewire.override {
|
||||||
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
|
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
|
||||||
# this means we lose firewire support (oh well..?)
|
# this means we lose firewire support (oh well..?)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user