From d4a305f5bbe88387d17032601c13e63518b24cf7 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 28 Aug 2023 11:52:39 +0000 Subject: [PATCH] cross: tuba: grab from nixpkgs fork --- nixpatches/list.nix | 5 +++++ overlays/cross.nix | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index b809ae81..dbaf6867 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -362,6 +362,11 @@ in [ saneCommit = "7a2d0a90cc558ea71dfc78356e61b0675b995634"; hash = "sha256-5uOYxC4+ZMjIbO1oSA/8ffuftgHSbrGuKjw3EnCHakU="; }) + (fetchpatch' { + title = "tuba: support cross compilation"; + saneCommit = "fc1121488c2358644f2d149bebf049512471adc0"; + hash = "sha256-ZTFC/bu/pO3s+SPQmKhvd+Y+tNE0KVK6bL+Br86A1eM="; + }) # (fetchpatch' { # # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped diff --git a/overlays/cross.nix b/overlays/cross.nix index 840ab9cd..897face3 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1831,11 +1831,12 @@ in { # # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment." # addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners # ); - tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: { - # 2023/07/27: upstreaming is blocked on p11-kit cross compilation - # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories - buildInputs = upstream.buildInputs ++ [ final.vala ]; - }); + # TODO(2023/08/27): send for PR: + # tuba = (wrapGAppsHook4Fix prev.tuba).overrideAttrs (upstream: { + # # 2023/07/27: upstreaming is blocked on p11-kit cross compilation + # # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories + # buildInputs = upstream.buildInputs ++ [ final.vala ]; + # }); # twitter-color-emoji = prev.twitter-color-emoji.override { # # fails to fix original error # inherit (emulated) stdenv;