Unverified Commit b80f9400 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parent 5ce18327

pkgs/applications/networking/instant-messengers/dino/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+16 −0
Original line number Diff line number Diff line 
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