From f33e960bdfd136bf578f595f12cd5ef5db1aa5bc Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 13 May 2024 17:31:50 +0000 Subject: [PATCH] cross: gnome-keyring: patch via nixpkgs patch instead of override --- nixpatches/list.nix | 8 ++++++++ overlays/cross.nix | 13 +++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index d867bc85..803751a3 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -38,6 +38,14 @@ in [ hash = "sha256-OU5XT/BEmZu1TPXSLKfEgdkoGXRETvJ9dePCeHrFl6o="; }) + (fetchpatch' { + # TODO: send upstream after successful deployment + title = "gnome.gnome-keyring: support cross compilation"; + # prUrl = "https://github.com/uninsane/nixpkgs/pull/new/pr-gnome-keyring-cross"; + saneCommit = "56bc064c0fa39614dfd1048daae4a59e4131df56"; + hash = "sha256-LZW3CNhcOU+YPTPt/4Ltxyiqo/6SdlIOQADmni4pDM4="; + }) + (fetchpatch' { # TODO: send upstream title = "python3Packages.dbus-python: fix cross"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 41c25e39..9c705d23 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -873,12 +873,13 @@ in with final; { # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable" # gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center; - gnome-keyring = super.gnome-keyring.overrideAttrs (orig: { - # 2024/02/27: upstreaming is unblocked - # this seems to work in practice, but leaves gkr with a reference to the build openssl, sqlite, xz, libxcrypt, glibc - # fixes "configure.ac:374: error: possibly undefined macro: AM_PATH_LIBGCRYPT" - nativeBuildInputs = orig.nativeBuildInputs ++ [ libgcrypt openssh glib ]; - }); + # gnome-keyring = super.gnome-keyring.overrideAttrs (orig: { + # # 2024/02/27: upstreaming is unblocked; implemented but not for PR + # # - + # # this seems to work in practice, but leaves gkr with a reference to the build openssl, sqlite, xz, libxcrypt, glibc + # # fixes "configure.ac:374: error: possibly undefined macro: AM_PATH_LIBGCRYPT" + # nativeBuildInputs = orig.nativeBuildInputs ++ [ libgcrypt openssh glib ]; + # }); gnome-maps = super.gnome-maps.overrideAttrs (upstream: { # 2023/11/21: upstreaming is blocked by libshumate, qtsvg (via pipewire/ffado) postPatch = (upstream.postPatch or "") + ''