From 4dbac40f65f70f67bbe37346febfcb430e652098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= Date: Mon, 30 Jan 2023 09:20:33 +0100 Subject: [PATCH 1/2] musikcube: activate portaudio, pipewire, sndio, core audio plugins --- pkgs/applications/audio/musikcube/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 706a36b5327f..a73703ddc904 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -15,13 +15,18 @@ , libopenmpt , mpg123 , ncurses +, portaudio , taglib # Linux Dependencies , alsa-lib +, pipewireSupport ? true, pipewire , pulseaudio +, sndioSupport ? true, sndio + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Darwin Dependencies +, coreaudioSupport ? stdenv.hostPlatform.isDarwin , Cocoa , SystemConfiguration }: @@ -50,6 +55,7 @@ stdenv.mkDerivation rec { ffmpeg gnutls lame + portaudio libev game-music-emu libmicrohttpd @@ -62,7 +68,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ alsa-lib pulseaudio ] ++ lib.optionals stdenv.isDarwin [ - Cocoa SystemConfiguration + Cocoa coreaudioSupport SystemConfiguration + ] ++ lib.optionals sndioSupport [ + sndio + ] ++ lib.optionals pipewireSupport [ + pipewire ]; cmakeFlags = [ From 2f6d2e99866cb816f2b401596996021d20048bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= Date: Mon, 30 Jan 2023 09:22:23 +0100 Subject: [PATCH 2/2] musikcube: order dependencies A-Z --- pkgs/applications/audio/musikcube/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index a73703ddc904..4f158879557c 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,34 +1,33 @@ -{ lib -, stdenv +{ asio , cmake -, pkg-config , curl -, asio , fetchFromGitHub , fetchpatch , ffmpeg , gnutls , lame +, lib , libev , game-music-emu , libmicrohttpd , libopenmpt , mpg123 , ncurses +, pkg-config , portaudio +, stdenv , taglib # Linux Dependencies , alsa-lib , pipewireSupport ? true, pipewire , pulseaudio , sndioSupport ? true, sndio - -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # Darwin Dependencies -, coreaudioSupport ? stdenv.hostPlatform.isDarwin , Cocoa , SystemConfiguration +, coreaudioSupport ? stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { @@ -55,13 +54,13 @@ stdenv.mkDerivation rec { ffmpeg gnutls lame - portaudio libev game-music-emu libmicrohttpd libopenmpt mpg123 ncurses + portaudio taglib ] ++ lib.optionals systemdSupport [ systemd @@ -69,9 +68,9 @@ stdenv.mkDerivation rec { alsa-lib pulseaudio ] ++ lib.optionals stdenv.isDarwin [ Cocoa coreaudioSupport SystemConfiguration - ] ++ lib.optionals sndioSupport [ + ] ++ lib.optional sndioSupport [ sndio - ] ++ lib.optionals pipewireSupport [ + ] ++ lib.optional pipewireSupport [ pipewire ];