From 22e96bdb57cdd792c685fda8b9af93a3ca2c3322 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 5 May 2024 23:12:36 +0000 Subject: [PATCH] fix dino build --- externals/patches/fix-compile-new-vala-c.diff | 16 ++++++++++++++++ sets/packages.nix | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 externals/patches/fix-compile-new-vala-c.diff diff --git a/externals/patches/fix-compile-new-vala-c.diff b/externals/patches/fix-compile-new-vala-c.diff new file mode 100644 index 0000000..b8277f3 --- /dev/null +++ b/externals/patches/fix-compile-new-vala-c.diff @@ -0,0 +1,16 @@ +diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi +index bcf12569..b32efd03 100644 +--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi ++++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi +@@ -22,9 +22,9 @@ public class Key { + public string issuer_name; + public string chain_id; + public Validity owner_trust; +- [CCode(array_null_terminated = true)] ++ [CCode(array_length = false, array_null_terminated = true)] + public SubKey[] subkeys; +- [CCode(array_null_terminated = true)] ++ [CCode(array_length = false, array_null_terminated = true)] + public UserID[] uids; + public KeylistMode keylist_mode; + // public string fpr; // requires gpgme >= 1.7.0 diff --git a/sets/packages.nix b/sets/packages.nix index c0fb997..62b35ed 100644 --- a/sets/packages.nix +++ b/sets/packages.nix @@ -93,7 +93,10 @@ yubikey-manager # GUI tools - dino + # TODO: temporary nixpkgs fix + (dino.overrideAttrs (old: { + patches = [ ../externals/patches/fix-compile-new-vala-c.diff ]; + })) evince gimp gnome3.eog