Merge pull request #314351 from adamcstephens/squeezelite/imp (0e844eba) · Commits · nix / nixpkgs

pkgs/applications/audio/squeezelite/default.nix→pkgs/by-name/sq/squeezelite/package.nix

+55 −41

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, 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
		, AudioToolbox
		, AudioUnit
		, Carbon
		, CoreAudio
		, CoreVideo
		, VideoDecodeAcceleration
		{
		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
		@@ -38,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
		@@ -54,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 [ 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
		@@ -75,7 +86,11 @@ stdenv.mkDerivation {

		EXECUTABLE = binName;

		OPTS = [ "-DLINKALL" "-DGPIO" ]
		OPTS =
		[
		"-DLINKALL"
		"-DGPIO"
		]
		++ optional dsdSupport "-DDSD"
		++ optional (!faad2Support) "-DNO_FAAD"
		++ optional ffmpegSupport "-DFFMPEG"
		@@ -86,15 +101,13 @@ 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

		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
		'';
		@@ -110,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;
		};
		}

pkgs/applications/audio/squeezelite/update.sh→pkgs/by-name/sq/squeezelite/update.sh

+0 −0

File moved.

View file

pkgs/top-level/all-packages.nix

+1 −7

Original line number	Diff line number	Diff line
		@@ -34505,13 +34505,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";
		};