From b9e4f6e1ab3893a6dd715369b273addab28a76b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 7 Oct 2021 21:44:55 +0200 Subject: dee: Fix build with latest Vala --- .../dee/0001-Fix-build-with-Vala-0.54.patch | 29 ++++++++++++++++++++++ pkgs/development/libraries/dee/default.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch diff --git a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch new file mode 100644 index 00000000000..4ad8ec8ffc7 --- /dev/null +++ b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch @@ -0,0 +1,29 @@ +From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Thu, 7 Oct 2021 21:42:26 +0200 +Subject: [PATCH] Fix build with Vala 0.54 + +Vala codegen now emits constructor methods so we need to skip @new +so that we can use a custom one from our VAPI overrides. + +https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8 +--- + vapi/Dee-1.0.metadata | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata +index 7e80de0..793ffd8 100644 +--- a/vapi/Dee-1.0.metadata ++++ b/vapi/Dee-1.0.metadata +@@ -1,6 +1,8 @@ + GListResultSet skip + GListResultSetClass skip + ++Filter ++ .new skip + FilterModel + .filter unowned + Model +-- +2.33.0 + diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index a023d164d8c..25cf88253e6 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/strict-prototype.patch" "${src}/debian/patches/vapi-skip-properties.patch" + ./0001-Fix-build-with-Vala-0.54.patch # Fixes glib 2.62 deprecations (fetchpatch { -- cgit 1.4.1