cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #207298 from wegank/snapcast

Browse source
This commit is contained in:
Franz Pletz 2022-12-27 08:31:28 +01:00 committed by GitHub
commit 27b782ee57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, darwin { stdenv, lib, fetchFromGitHub, cmake, pkg-config
, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
, IOKit, AudioToolbox
, aixlog, popl , aixlog, popl
, pulseaudioSupport ? false, libpulseaudio , pulseaudioSupport ? false, libpulseaudio
, nixosTests }: , nixosTests }:
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
aixlog popl soxr aixlog popl soxr
] ++ lib.optional pulseaudioSupport libpulseaudio ] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox]; ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ];
TARGET=lib.optionalString stdenv.isDarwin "MACOS"; TARGET=lib.optionalString stdenv.isDarwin "MACOS";
@ -45,7 +46,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
# never built on x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isx86_64;
}; };
} }

3
pkgs/top-level/all-packages.nix
View file

@ -11731,7 +11731,8 @@ with pkgs;
snallygaster = callPackage ../tools/security/snallygaster { }; snallygaster = callPackage ../tools/security/snallygaster { };
snapcast = callPackage ../applications/audio/snapcast { snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast {
inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox;
pulseaudioSupport = config.pulseaudio or stdenv.isLinux; pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
}; };