From 6fce599d1c0431b7aea41a3baaa7b7916a182e5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Mar 2019 06:01:01 +0100 Subject: [PATCH] dleyna-server: fix build with gupnp 1.2 --- .../libraries/dleyna-server/default.nix | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 79b0155c9132..4730d4559503 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,8 +1,20 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, makeWrapper +, pkgconfig +, dleyna-core +, dleyna-connector-dbus +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, libsoup +}: stdenv.mkDerivation rec { pname = "dleyna-server"; - name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { @@ -12,8 +24,30 @@ stdenv.mkDerivation rec { sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; + patches = [ + # fix build with gupnp 1.2 + # https://github.com/intel/dleyna-server/pull/161 + (fetchpatch { + url = https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch; + sha256 = "0p8fn331x2whvn6skxqvfzilx0m0yx2q5mm2wh2625l396m3fzmm"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + makeWrapper + ]; + + buildInputs = [ + dleyna-core + dleyna-connector-dbus + gssdp + gupnp + gupnp-av + gupnp-dlna + libsoup + ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \