diff options
| -rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/shairplay/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index fc67035ce20..297883ecd0a 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -8,7 +8,7 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-${version}"; + name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}"; version = "0.7"; src = fetchurl { diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index f9b17b947cf..e5312b92902 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -2,14 +2,14 @@ , avahi, libao }: stdenv.mkDerivation rec { - name = "shairplay-${version}"; - version = "2016-01-01"; + name = "shairplay-unstable-${version}"; + version = "2018-08-24"; src = fetchFromGitHub { owner = "juhovh"; repo = "shairplay"; - rev = "ce80e005908f41d0e6fde1c4a21e9cb8ee54007b"; - sha256 = "10b4bmqgf4rf1wszvj066mc42p90968vqrmyqyrdal4k6f8by1r6"; + rev = "096b61ad14c90169f438e690d096e3fcf87e504e"; + sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "Apple airplay and raop protocol server"; + description = "Apple AirPlay and RAOP protocol server"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7436ec0887..8905abe426a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -870,6 +870,10 @@ in 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-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; @@ -14149,7 +14153,7 @@ in sambaFull = samba4Full; - shairplay = callPackage ../servers/shairplay { }; + shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; shairport-sync = callPackage ../servers/shairport-sync { }; @@ -18503,9 +18507,7 @@ in multimon-ng = callPackage ../applications/radio/multimon-ng { }; inherit (callPackages ../applications/networking/mumble { - avahi = avahi.override { - withLibdnssdCompat = true; - }; + avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -18513,9 +18515,7 @@ in }) mumble mumble_git murmur; inherit (callPackages ../applications/networking/mumble { - avahi = avahi.override { - withLibdnssdCompat = true; - }; + avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; |