b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #125532 from petabyteboy/feature/snapcast-0-25

Browse source
This commit is contained in:
Martin Weinelt 2021-06-03 20:41:53 +02:00 committed by GitHub
parent 4241512688 6d27068d7c
commit 64f1254248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/snapcast.nix
View file

@ -72,10 +72,10 @@ in {
) )
with subtest("test a connection"): with subtest("test a connection"):
client.execute("systemd-run snapclient -h server -p ${toString port}") client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")
server.wait_until_succeeds( server.wait_until_succeeds(
"journalctl -o cat -u snapserver.service | grep -q 'Hello from'" "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
) )
client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}") client.wait_until_succeeds("journalctl -o cat -u snapcast-client | grep -q 'buffer: ${toString bufferSize}'")
''; '';
}) })

9
pkgs/applications/audio/snapcast/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config { stdenv, lib, fetchFromGitHub, cmake, pkg-config
, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr , alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
, nixosTests }: , nixosTests }:
let let
@ -34,19 +34,20 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapcast"; pname = "snapcast";
version = "0.24.0"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "badaix"; owner = "badaix";
repo = "snapcast"; repo = "snapcast";
rev = "v${version}"; rev = "v${version}";
sha256 = "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g"; sha256 = "064pcpr5dsv9hncqkrnxriva4xjv1vcxhvc69h1an8x8vn4dwgmf";
}; };
nativeBuildInputs = [ cmake pkg-config boost170.dev ]; nativeBuildInputs = [ cmake pkg-config ];
# snapcast also supports building against tremor but as we have libogg, that's # snapcast also supports building against tremor but as we have libogg, that's
# not needed # not needed
buildInputs = [ buildInputs = [
boost17x
alsaLib asio avahi flac libogg libvorbis alsaLib asio avahi flac libogg libvorbis
aixlog popl soxr aixlog popl soxr
]; ];