gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dino: fix build with vala-c update (#309265)

Browse Source
This commit is contained in:
Sandro
2024-05-05 18:33:37 +02:00
committed by GitHub
parent 5ce1832751
commit b80f9400d8
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/dino/default.nix
+6
View File
@@ -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 \
pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff
+16
View File
@@ -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