git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56334 from peterhoeg/u/shairplay

shairplay: 2016-01-01 -> 2018-08-24 and add avahi-compat convenience derivation

commit017f0e8043da8865ca318dbb37351c2c1bbc8ad3 authorPeter Hoeg <peter@hoeg.com> dateMon 18 Mar 2019, 11:29 (8 years ago) parente913308d8c3d56
3 files changed+13−13
pkgs/development/libraries/avahi/default.nix+1−1 pkgs/servers/shairplay/default.nix+5−5 pkgs/top-level/all-packages.nix+7−7
pkgs/development/libraries/avahi/default.nix+1−1
@@ -8,7 +8,7 @@
88assert qt4Support -> qt4 != null;
99
1010stdenv.mkDerivation rec {
11− name = "avahi-${version}";
11+ name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
1212 version = "0.7";
1313
1414 src = fetchurl {
pkgs/servers/shairplay/default.nix+5−5
@@ -2,14 +2,14 @@
22, avahi, libao }:
33
44stdenv.mkDerivation rec {
5− name = "shairplay-${version}";
6− version = "2016-01-01";
5+ name = "shairplay-unstable-${version}";
6+ version = "2018-08-24";
77
88 src = fetchFromGitHub {
99 owner = "juhovh";
1010 repo = "shairplay";
11− rev = "ce80e005908f41d0e6fde1c4a21e9cb8ee54007b";
12− sha256 = "10b4bmqgf4rf1wszvj066mc42p90968vqrmyqyrdal4k6f8by1r6";
11+ rev = "096b61ad14c90169f438e690d096e3fcf87e504e";
12+ sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa";
1313 };
1414
1515 nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
2828 meta = with stdenv.lib; {
2929 inherit (src.meta) homepage;
30− description = "Apple airplay and raop protocol server";
30+ description = "Apple AirPlay and RAOP protocol server";
3131 license = licenses.mit;
3232 maintainers = with maintainers; [ peterhoeg ];
3333 platforms = platforms.unix;
pkgs/top-level/all-packages.nix+7−7
@@ -870,6 +870,10 @@ in
870870
871871 avahi = callPackage ../development/libraries/avahi (config.avahi or {});
872872
873+ avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
874+ withLibdnssdCompat = true;
875+ });
876+
873877 avro-c = callPackage ../development/libraries/avro-c { };
874878
875879 avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
@@ -14149,7 +14153,7 @@ in
1414914153
1415014154 sambaFull = samba4Full;
1415114155
14152− shairplay = callPackage ../servers/shairplay { };
14156+ shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
1415314157
1415414158 shairport-sync = callPackage ../servers/shairport-sync { };
1415514159
@@ -18503,9 +18507,7 @@ in
1850318507 multimon-ng = callPackage ../applications/radio/multimon-ng { };
1850418508
1850518509 inherit (callPackages ../applications/networking/mumble {
18506− avahi = avahi.override {
18507− withLibdnssdCompat = true;
18508− };
18510+ avahi = avahi-compat;
1850918511 jackSupport = config.mumble.jackSupport or false;
1851018512 speechdSupport = config.mumble.speechdSupport or false;
1851118513 pulseSupport = config.pulseaudio or false;
@@ -18513,9 +18515,7 @@ in
1851318515 }) mumble mumble_git murmur;
1851418516
1851518517 inherit (callPackages ../applications/networking/mumble {
18516− avahi = avahi.override {
18517− withLibdnssdCompat = true;
18518− };
18518+ avahi = avahi-compat;
1851918519 jackSupport = config.mumble.jackSupport or false;
1852018520 speechdSupport = config.mumble.speechdSupport or false;
1852118521 pulseSupport = config.pulseaudio or false;