cross: gnome-keyring: patch via nixpkgs patch instead of override
This commit is contained in:
parent
14202a5bcc
commit
f33e960bdf
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
# # - <https://github.com/uninsane/nixpkgs/pull/new/pr-gnome-keyring-cross>
|
||||
# # 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 "") + ''
|
||||
|
|
Loading…
Reference in New Issue
Block a user