From deaee833cfc55c53247ce4a015ffa8330a331e39 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 28 Aug 2023 10:08:50 +0000 Subject: [PATCH] cross: move phog patch to preferences.nix --- overlays/cross.nix | 2 -- overlays/preferences.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index e7e51edd..f7e331d5 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -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" diff --git a/overlays/preferences.nix b/overlays/preferences.nix index 4fa1668e..d34ea30d 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -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..?)