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-server/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-server/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/dleyna-server/default.nix | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix index 79b0155c9132..4730d4559503 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix +++ b/nixpkgs/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" \ |