diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-03-16 05:52:48 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-16 15:16:25 +0200 |
commit | 40cd020bd639c0c109fd30fcbcd2c49671000a9f (patch) | |
tree | 7448ab8749447d864064a4b9fbc2b5192e086e90 /pkgs/development/libraries/dleyna-core | |
parent | c947e2dca41f1326306b6b46c692bf7c87bc5f04 (diff) |
dleyna-core: fix build with gupnp-1.2
Diffstat (limited to 'pkgs/development/libraries/dleyna-core')
-rw-r--r-- | pkgs/development/libraries/dleyna-core/default.nix | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 787030eed9877..9d83812fefb75 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,10 +1,17 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkgconfig +, gupnp +}: stdenv.mkDerivation rec { pname = "dleyna-core"; - name = "${pname}-${version}"; version = "0.6.0"; + setupHook = ./setup-hook.sh; + src = fetchFromGitHub { owner = "01org"; repo = pname; @@ -12,12 +19,25 @@ stdenv.mkDerivation rec { sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq"; }; - setupHook = ./setup-hook.sh; + patches = [ + ./0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch + + # fix build with gupnp 1.2 + # https://github.com/intel/dleyna-core/pull/52 + (fetchpatch { + url = https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch; + sha256 = "1h758cp65v7qyfpvyqdri7q0gwx85mhdpkb2y8waq735q5q9ib39"; + }) + ]; - patches = [ ./0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - propagatedBuildInputs = [ gupnp ]; + propagatedBuildInputs = [ + gupnp + ]; meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; |