diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/dleyna-server | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dleyna-server')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dleyna-server/default.nix | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix index a0a414abf748..484afc7c417d 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/dleyna-server/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub -, fetchpatch -, autoreconfHook +, meson +, ninja , makeWrapper , pkg-config , dleyna-core @@ -15,33 +16,25 @@ stdenv.mkDerivation rec { pname = "dleyna-server"; - version = "0.6.0"; + version = "0.7.2"; src = fetchFromGitHub { - owner = "01org"; + owner = "phako"; repo = pname; - rev = version; - sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j"; + rev = "v${version}"; + sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME="; }; - 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 + meson + ninja pkg-config makeWrapper ]; buildInputs = [ dleyna-core - dleyna-connector-dbus + dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH gssdp gupnp gupnp-av @@ -56,9 +49,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = "https://01.org/dleyna"; - maintainers = [ maintainers.jtojnar ]; + homepage = "https://github.com/phako/dleyna-server"; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } |