Merge pull request #247330 from bobby285271/fix/dleyna

dleyna-*: Fix build with meson 1.2

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

pkgs/development/libraries/dleyna-renderer/default.nix

@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -27,6 +28,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw=";
   };
 
+  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/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch";
+      sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

pkgs/development/libraries/dleyna-server/default.nix

@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , meson
 , ninja
 , makeWrapper
@@ -25,6 +26,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME=";
   };
 
+  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/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch";
+      sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja