From 5e09c0ef0d10b1ad77fed18faad8470d757b3869 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 3 Nov 2024 17:05:57 +0100 Subject: [PATCH 1/3] alac: init at 0.0.7-unstable-2024-10-16 --- pkgs/by-name/al/alac/package.nix | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/al/alac/package.nix diff --git a/pkgs/by-name/al/alac/package.nix b/pkgs/by-name/al/alac/package.nix new file mode 100644 index 000000000000..5aaedfe3c454 --- /dev/null +++ b/pkgs/by-name/al/alac/package.nix @@ -0,0 +1,45 @@ +{ + autoreconfHook, + fetchFromGitHub, + lib, + stdenv, + testers, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "alac"; + version = "0.0.7-unstable-2024-10-16"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "mikebrady"; + repo = "alac"; + rev = "1832544d27d01335d823d639b176d1cae25ecfd4"; + hash = "sha256-xRWDeqyJ/BEaSWVlDXgaKIKJuBwM8kJDIATVTVaMn2k="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + # error: 'TARGET_OS_MAC' is not defined, evaluates to 0 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_MAC"; + + passthru = { + updateScript = unstableGitUpdater { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Apple Lossless Codec and Utility with Autotools"; + homepage = "https://github.com/mikebrady/alac"; + license = lib.licenses.asl20; + pkgConfigModules = [ "alac" ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +}) From e18636696b972672baa680c938be52d00f5c1189 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 2 Nov 2024 22:21:18 +0100 Subject: [PATCH 2/3] shairport-sync: enable additional features --- pkgs/by-name/sh/shairport-sync/package.nix | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index f74813cd4608..7c0eec703ff7 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -18,19 +18,31 @@ , libconfig , libpulseaudio , libjack2 +, libsndfile +, libao +, libsoundio +, mosquitto , pipewire , soxr +, alac +, sndio , enableAirplay2 ? false , enableStdout ? true , enableAlsa ? true +, enableSndio ? true , enablePulse ? true , enablePipe ? true , enablePipewire ? true +, enableAo ? true , enableJack ? true -, enableMetadata ? false +, enableSoundio ? true +, enableMetadata ? true , enableMpris ? stdenv.hostPlatform.isLinux +, enableMqttClient ? true , enableDbus ? stdenv.hostPlatform.isLinux , enableSoxr ? true +, enableAlac ? true +, enableConvolution ? true , enableLibdaemon ? false }: @@ -70,10 +82,16 @@ stdenv.mkDerivation rec { ] ++ optional enableLibdaemon libdaemon ++ optional enableAlsa alsa-lib + ++ optional enableSndio sndio + ++ optional enableMqttClient mosquitto ++ optional enablePulse libpulseaudio ++ optional enablePipewire pipewire + ++ optional enableAo libao ++ optional enableJack libjack2 + ++ optional enableSoundio libsoundio ++ optional enableSoxr soxr + ++ optional enableAlac alac + ++ optional enableConvolution libsndfile ++ optionals enableAirplay2 [ libplist libsodium @@ -100,13 +118,19 @@ stdenv.mkDerivation rec { ++ optional enablePulse "--with-pa" ++ optional enablePipewire "--with-pw" ++ optional enableAlsa "--with-alsa" + ++ optional enableSndio "--with-sndio" + ++ optional enableAo "--with-ao" ++ optional enableJack "--with-jack" + ++ optional enableSoundio "--with-soundio" ++ optional enableStdout "--with-stdout" ++ optional enablePipe "--with-pipe" ++ optional enableSoxr "--with-soxr" + ++ optional enableAlac "--with-apple-alac" + ++ optional enableConvolution "--with-convolution" ++ optional enableDbus "--with-dbus-interface" ++ optional enableMetadata "--with-metadata" ++ optional enableMpris "--with-mpris-interface" + ++ optional enableMqttClient "--with-mqtt-client" ++ optional enableLibdaemon "--with-libdaemon" ++ optional enableAirplay2 "--with-airplay-2"; From 46df617e7a5dbc0b2339bb29627e40f80658a1ca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Nov 2024 18:38:34 +0100 Subject: [PATCH 3/3] shairport-sync-airplay2: init at 4.3.4 shairport-sync can not be build with airplay1 and airplay2 at the same time so add a variant for airplay2 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f45b720e1db..93c61608eabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12312,6 +12312,10 @@ with pkgs; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; + shairport-sync-airplay2 = shairport-sync.override { + enableAirplay2 = true; + }; + showoff = callPackage ../servers/http/showoff { }; ruby-zoom = callPackage ../tools/text/ruby-zoom { };