diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 1002f9b67..b529b3913 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -1140,9 +1140,9 @@ in mesonFlags = upstream.mesonFlags ++ [ "-Dphoc_tests=disabled" # "tests/meson.build:20:0: ERROR: Program 'phoc' not found or not executable" ]; - postPatch = upstream.postPatch or "" + '' - sed -i 's:gio_querymodules = :gio_querymodules = "${next.buildPackages.glib.dev}/bin/gio-querymodules" if True else :' build-aux/post_install.py - ''; + # postPatch = upstream.postPatch or "" + '' + # sed -i 's:gio_querymodules = :gio_querymodules = "${next.buildPackages.glib.dev}/bin/gio-querymodules" if True else :' build-aux/post_install.py + # ''; }); # phosh-mobile-settings = prev.phosh-mobile-settings.override { # # fixes "meson.build:26:0: ERROR: Dependency "phosh-plugins" not found, tried pkgconfig" diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 1cf3a2236..8f8772d2d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -37,6 +37,12 @@ # let ccache cross-compile ./2023-03-04-ccache-cross-fix.patch + # 2023-03-09: phosh: 0.23 -> 0.25.1 + (fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/219355.diff"; + hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ="; + }) + # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized