diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-23 14:04:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-23 14:04:26 +0100 |
commit | a463643de88ec09fed4a5f9ad77fe3a6410d13b0 (patch) | |
tree | 4e2903bfc64b32b469d88e42f6cc90d3735f2968 | |
parent | ab27bcf01e1686ee449ec63c26595dee289942de (diff) | |
parent | 3eeecc0988117b30c9e1340f2e264ae4ebd75a06 (diff) | |
download | nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar.gz nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar.bz2 nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar.lz nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar.xz nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.tar.zst nixlib-a463643de88ec09fed4a5f9ad77fe3a6410d13b0.zip |
Merge pull request #48856 from peterhoeg/u/sc
snapcast: 0.14.0 -> 0.15.0
-rw-r--r-- | pkgs/applications/audio/snapcast/default.nix | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 3afd73493b05..5730dec6b994 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,49 +1,61 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, asio, alsaLib, avahi, libogg, libvorbis, flac }: +, alsaLib, asio, avahi, flac, libogg, libvorbis }: let - popl = stdenv.mkDerivation rec { - name = "popl-${version}"; - version = "1.1.0"; + dependency = { name, version, sha256 }: + stdenv.mkDerivation { + name = "${name}-${version}"; src = fetchFromGitHub { owner = "badaix"; - repo = "popl"; - rev = "v${version}"; - sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + repo = name; + rev = "v${version}"; + inherit sha256; }; + nativeBuildInputs = [ cmake ]; }; - aixlog = stdenv.mkDerivation rec { - name = "aixlog-${version}"; + aixlog = dependency { + name = "aixlog"; version = "1.2.1"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; - src = fetchFromGitHub { - owner = "badaix"; - repo = "aixlog"; - rev = "v${version}"; - sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; - }; - nativeBuildInputs = [ cmake ]; + popl = dependency { + name = "popl"; + version = "1.2.0"; + sha256 = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai"; }; in stdenv.mkDerivation rec { name = "snapcast-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { - owner = "badaix"; - repo = "snapcast"; - rev = "v${version}"; - sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + # snapcast also supports building against tremor but as we have libogg, that's + # not needed + buildInputs = [ + alsaLib asio avahi flac libogg libvorbis + aixlog popl + ]; + + # Upstream systemd unit files are pretty awful, so we provide our own in a + # NixOS module. It might make sense to get that upstreamed... + postInstall = '' + install -d $out/share/doc/snapcast + cp -r ../doc/* ../*.md $out/share/doc/snapcast + ''; meta = with lib; { description = "Synchronous multi-room audio player"; |