diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-05 18:33:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-05 18:33:37 +0200 |
| commit | b80f9400d89e3702aa88330d3abc90377618b674 (patch) | |
| tree | caf75f3d291b8a692c2fb77292dfabc9302b19b8 /pkgs/applications/networking/instant-messengers/dino | |
| parent | 5ce18327518fd06633bf4b9add6e982bb1a5f610 (diff) | |
dino: fix build with vala-c update (#309265)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/dino')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/dino/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 19e84a5f30794..428715b6f1b7a 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw="; }; + patches = [ + # fixes build failure https://github.com/dino/dino/issues/1576 + # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74 + ./fix-compile-new-vala-c.diff + ]; + postPatch = '' # don't overwrite manually set version information substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff b/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff new file mode 100644 index 0000000000000..b8277f32afc9c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/dino/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 |