diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
commit | 373507e28edeacd168b5c240840db2dac854882a (patch) | |
tree | c73c8912afbd1a533dbc0d27da25dcd7f0d13d58 /nixpkgs/pkgs/development/libraries/dleyna-core/default.nix | |
parent | b2ac96a35da6f6b95c7197811e421270319e8d50 (diff) | |
parent | dfd8f84aef129f1978e446b5d45ef05cd4421821 (diff) | |
download | nixlib-373507e28edeacd168b5c240840db2dac854882a.tar nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.gz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.bz2 nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.lz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.xz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.zst nixlib-373507e28edeacd168b5c240840db2dac854882a.zip |
Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dleyna-core/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dleyna-core/default.nix | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix index 787030eed987..9d83812fefb7 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix +++ b/nixpkgs/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"; |