Merge pull request #56334 from peterhoeg/u/shairplay
shairplay: 2016-01-01 -> 2018-08-24 and add avahi-compat convenience derivation
This commit is contained in:
commit
017f0e8043
|
@ -8,7 +8,7 @@
|
||||||
assert qt4Support -> qt4 != null;
|
assert qt4Support -> qt4 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "avahi-${version}";
|
name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
|
||||||
version = "0.7";
|
version = "0.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
, avahi, libao }:
|
, avahi, libao }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "shairplay-${version}";
|
name = "shairplay-unstable-${version}";
|
||||||
version = "2016-01-01";
|
version = "2018-08-24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "juhovh";
|
owner = "juhovh";
|
||||||
repo = "shairplay";
|
repo = "shairplay";
|
||||||
rev = "ce80e005908f41d0e6fde1c4a21e9cb8ee54007b";
|
rev = "096b61ad14c90169f438e690d096e3fcf87e504e";
|
||||||
sha256 = "10b4bmqgf4rf1wszvj066mc42p90968vqrmyqyrdal4k6f8by1r6";
|
sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
description = "Apple airplay and raop protocol server";
|
description = "Apple AirPlay and RAOP protocol server";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ peterhoeg ];
|
maintainers = with maintainers; [ peterhoeg ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
|
|
@ -870,6 +870,10 @@ in
|
||||||
|
|
||||||
avahi = callPackage ../development/libraries/avahi (config.avahi or {});
|
avahi = callPackage ../development/libraries/avahi (config.avahi or {});
|
||||||
|
|
||||||
|
avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
|
||||||
|
withLibdnssdCompat = true;
|
||||||
|
});
|
||||||
|
|
||||||
avro-c = callPackage ../development/libraries/avro-c { };
|
avro-c = callPackage ../development/libraries/avro-c { };
|
||||||
|
|
||||||
avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
|
avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
|
||||||
|
@ -14149,7 +14153,7 @@ in
|
||||||
|
|
||||||
sambaFull = samba4Full;
|
sambaFull = samba4Full;
|
||||||
|
|
||||||
shairplay = callPackage ../servers/shairplay { };
|
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
|
||||||
|
|
||||||
shairport-sync = callPackage ../servers/shairport-sync { };
|
shairport-sync = callPackage ../servers/shairport-sync { };
|
||||||
|
|
||||||
|
@ -18503,9 +18507,7 @@ in
|
||||||
multimon-ng = callPackage ../applications/radio/multimon-ng { };
|
multimon-ng = callPackage ../applications/radio/multimon-ng { };
|
||||||
|
|
||||||
inherit (callPackages ../applications/networking/mumble {
|
inherit (callPackages ../applications/networking/mumble {
|
||||||
avahi = avahi.override {
|
avahi = avahi-compat;
|
||||||
withLibdnssdCompat = true;
|
|
||||||
};
|
|
||||||
jackSupport = config.mumble.jackSupport or false;
|
jackSupport = config.mumble.jackSupport or false;
|
||||||
speechdSupport = config.mumble.speechdSupport or false;
|
speechdSupport = config.mumble.speechdSupport or false;
|
||||||
pulseSupport = config.pulseaudio or false;
|
pulseSupport = config.pulseaudio or false;
|
||||||
|
@ -18513,9 +18515,7 @@ in
|
||||||
}) mumble mumble_git murmur;
|
}) mumble mumble_git murmur;
|
||||||
|
|
||||||
inherit (callPackages ../applications/networking/mumble {
|
inherit (callPackages ../applications/networking/mumble {
|
||||||
avahi = avahi.override {
|
avahi = avahi-compat;
|
||||||
withLibdnssdCompat = true;
|
|
||||||
};
|
|
||||||
jackSupport = config.mumble.jackSupport or false;
|
jackSupport = config.mumble.jackSupport or false;
|
||||||
speechdSupport = config.mumble.speechdSupport or false;
|
speechdSupport = config.mumble.speechdSupport or false;
|
||||||
pulseSupport = config.pulseaudio or false;
|
pulseSupport = config.pulseaudio or false;
|
||||||
|
|
Loading…
Reference in a new issue