From 03e1c7f0069b1b3d6dc75c458dd6a5b228865d9e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 5 Aug 2023 20:28:22 +0800 Subject: [PATCH] dleyna-connector-dbus: Fix build with meson 1.2 ERROR: Unexpected "[provides]" section, did you mean "[provide]"? --- .../libraries/dleyna-connector-dbus/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 1c0d360e4f4..a6983decf33 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -4,6 +4,7 @@ , ninja , pkg-config , fetchFromGitHub +, fetchpatch , dleyna-core , glib }: @@ -19,6 +20,17 @@ stdenv.mkDerivation rec { sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; }; + patches = [ + # Fix build with meson 1.2. We use the gentoo patch intead of the + # usptream one because the latter only applies on the libsoup_3 based + # merged dLeyna project. + # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 + (fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; + sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; + }) + ]; + nativeBuildInputs = [ meson ninja