colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: gnome-keyring: patch via nixpkgs patch instead of override

Browse Source
This commit is contained in:
Colin
2024-05-13 17:31:50 +00:00
parent 14202a5bcc
commit f33e960bdf
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixpatches/list.nix
View File

@@ -38,6 +38,14 @@ in [
hash = "sha256-OU5XT/BEmZu1TPXSLKfEgdkoGXRETvJ9dePCeHrFl6o="; 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' { (fetchpatch' {
# TODO: send upstream # TODO: send upstream
title = "python3Packages.dbus-python: fix cross"; title = "python3Packages.dbus-python: fix cross";

13
overlays/cross.nix
View File

@@ -873,12 +873,13 @@ in with final; {
# fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable" # 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-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;
gnome-keyring = super.gnome-keyring.overrideAttrs (orig: { # gnome-keyring = super.gnome-keyring.overrideAttrs (orig: {
# 2024/02/27: upstreaming is unblocked # # 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 # # - <https://github.com/uninsane/nixpkgs/pull/new/pr-gnome-keyring-cross>
# fixes "configure.ac:374: error: possibly undefined macro: AM_PATH_LIBGCRYPT" # # this seems to work in practice, but leaves gkr with a reference to the build openssl, sqlite, xz, libxcrypt, glibc
nativeBuildInputs = orig.nativeBuildInputs ++ [ libgcrypt openssh glib ]; # # fixes "configure.ac:374: error: possibly undefined macro: AM_PATH_LIBGCRYPT"
}); # nativeBuildInputs = orig.nativeBuildInputs ++ [ libgcrypt openssh glib ];
# });
gnome-maps = super.gnome-maps.overrideAttrs (upstream: { gnome-maps = super.gnome-maps.overrideAttrs (upstream: {
# 2023/11/21: upstreaming is blocked by libshumate, qtsvg (via pipewire/ffado) # 2023/11/21: upstreaming is blocked by libshumate, qtsvg (via pipewire/ffado)
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''