From bb217ecd7bac40cb9f592ff57ee2618c1407117b Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 24 Oct 2023 10:27:33 +0000 Subject: [PATCH] gsound: push cross compilation patch upstream --- nixpatches/list.nix | 7 +++++++ overlays/cross.nix | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index f0b75b5c..2d335dbf 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -19,6 +19,13 @@ let // (if title != null then { name = title; } else {}) ); in [ + (fetchpatch' { + title = "gsound: enable introspection/vala when cross compiled"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/263107"; + saneCommit = "beb33584013f49d198152ad8ae8797bb6fa0266f"; + # hash = "sha256-tKeumQ1R/UWTL2J9RaGs8p9QHxGxP2a1DevHnX/ElRU="; + hash = "sha256-W9IS3JNPk5LkJeuZ+EL8NIv8+v7wEZo8Gt+ofq3RrrY="; + }) (fetchpatch' { title = "trust-dns: 0.23.0 -> 0.24.0"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; diff --git a/overlays/cross.nix b/overlays/cross.nix index ed62af42..91f22a6d 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -867,10 +867,11 @@ in { strictDeps = true; }); - gsound = prev.gsound.overrideAttrs (upstream: { - # remove logic which was removing introspection/vala on cross compilation - mesonFlags = []; - }); + # 2023/10/23: out for review: + # gsound = prev.gsound.overrideAttrs (upstream: { + # # remove logic which was removing introspection/vala on cross compilation + # mesonFlags = []; + # }); gspell = prev.gspell.overrideAttrs (upstream: { depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ # without this, vapi files ($dev/share/vapi/vala/gspell-1.vapi) aren't generated.