From bf6e8370b011325b2faeb54a04a53ce4a544f59c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 24 May 2024 14:56:00 -0400 Subject: [PATCH 1/3] squeezelite: install man page instead of readme --- pkgs/applications/audio/squeezelite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 92f6932fb375..a8194ee17bb8 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { runHook preInstall install -Dm555 -t $out/bin ${binName} - install -Dm444 -t $out/share/doc/squeezelite *.txt *.md + install -Dm444 -t $out/share/man/man1 doc/squeezelite.1 runHook postInstall ''; From 56c6cab3376f718057322973fc1b0f9a0d26bc98 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 24 May 2024 15:03:41 -0400 Subject: [PATCH 2/3] squeezelite: move to by-name --- .../default.nix => by-name/sq/squeezelite/package.nix} | 9 ++------- .../audio => by-name/sq}/squeezelite/update.sh | 0 pkgs/top-level/all-packages.nix | 8 +------- 3 files changed, 3 insertions(+), 14 deletions(-) rename pkgs/{applications/audio/squeezelite/default.nix => by-name/sq/squeezelite/package.nix} (93%) rename pkgs/{applications/audio => by-name/sq}/squeezelite/update.sh (100%) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/by-name/sq/squeezelite/package.nix similarity index 93% rename from pkgs/applications/audio/squeezelite/default.nix rename to pkgs/by-name/sq/squeezelite/package.nix index a8194ee17bb8..37c199526893 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , fetchFromGitHub , flac , libgpiod @@ -24,12 +25,6 @@ , portaudioSupport ? stdenv.isDarwin , portaudio , slimserver -, AudioToolbox -, AudioUnit -, Carbon -, CoreAudio -, CoreVideo -, VideoDecodeAcceleration }: let @@ -58,7 +53,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.isDarwin [ CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon ]) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/applications/audio/squeezelite/update.sh b/pkgs/by-name/sq/squeezelite/update.sh similarity index 100% rename from pkgs/applications/audio/squeezelite/update.sh rename to pkgs/by-name/sq/squeezelite/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8126fabe5d66..840ab02ae1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34524,13 +34524,7 @@ with pkgs; psst = callPackage ../applications/audio/psst { }; - squeezelite = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - }; - - squeezelite-pulse = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - + squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; }; From 169f82c99e2dcf780500360abf0cb1e328c44cf8 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 24 May 2024 15:04:10 -0400 Subject: [PATCH 3/3] squeezelite: format --- pkgs/by-name/sq/squeezelite/package.nix | 89 +++++++++++++++---------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index 37c199526893..41d5f8c9d343 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -1,30 +1,31 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, flac -, libgpiod -, libmad -, libpulseaudio -, libvorbis -, mpg123 -, audioBackend ? if stdenv.isLinux then "alsa" else "portaudio" -, alsaSupport ? stdenv.isLinux -, alsa-lib -, dsdSupport ? true -, faad2Support ? true -, faad2 -, ffmpegSupport ? true -, ffmpeg -, opusSupport ? true -, opusfile -, resampleSupport ? true -, soxr -, sslSupport ? true -, openssl -, portaudioSupport ? stdenv.isDarwin -, portaudio -, slimserver +{ + lib, + stdenv, + darwin, + fetchFromGitHub, + flac, + libgpiod, + libmad, + libpulseaudio, + libvorbis, + mpg123, + audioBackend ? if stdenv.isLinux then "alsa" else "portaudio", + alsaSupport ? stdenv.isLinux, + alsa-lib, + dsdSupport ? true, + faad2Support ? true, + faad2, + ffmpegSupport ? true, + ffmpeg, + opusSupport ? true, + opusfile, + resampleSupport ? true, + soxr, + sslSupport ? true, + openssl, + portaudioSupport ? stdenv.isDarwin, + portaudio, + slimserver, }: let @@ -33,7 +34,6 @@ let pulseSupport = audioBackend == "pulse"; binName = "squeezelite${optionalString pulseSupport "-pulse"}"; - in stdenv.mkDerivation { # the nixos module uses the pname as the binary name @@ -49,11 +49,27 @@ stdenv.mkDerivation { hash = "sha256-FGqo/c74JN000w/iRnvYUejqnYGDzHNZu9pEmR7yR3s="; }; - buildInputs = [ flac libmad libvorbis mpg123 ] + buildInputs = + [ + flac + libmad + libvorbis + mpg123 + ] ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon ]) + ++ optionals stdenv.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; + [ + CoreVideo + VideoDecodeAcceleration + CoreAudio + AudioToolbox + AudioUnit + Carbon + ] + ) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile @@ -70,7 +86,11 @@ stdenv.mkDerivation { EXECUTABLE = binName; - OPTS = [ "-DLINKALL" "-DGPIO" ] + OPTS = + [ + "-DLINKALL" + "-DGPIO" + ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" ++ optional ffmpegSupport "-DFFMPEG" @@ -81,9 +101,7 @@ stdenv.mkDerivation { ++ optional sslSupport "-DUSE_SSL" ++ optional (stdenv.isAarch32 or stdenv.isAarch64) "-DRPI"; - env = lib.optionalAttrs stdenv.isDarwin { - LDADD = "-lportaudio -lpthread"; - }; + env = lib.optionalAttrs stdenv.isDarwin { LDADD = "-lportaudio -lpthread"; }; installPhase = '' runHook preInstall @@ -105,6 +123,7 @@ stdenv.mkDerivation { license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; mainProgram = binName; maintainers = with maintainers; [ adamcstephens ]; - platforms = if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; + platforms = + if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; }; }