From 1bb61c9080adaeb40c9ae4b6bb7222a11f8bbcf1 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 8 Jul 2024 11:13:27 +0200 Subject: [PATCH 1/4] musikcube: 3.0.2 -> 3.0.3 --- pkgs/applications/audio/musikcube/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index db91a2952bf2..1496f3065198 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -2,7 +2,7 @@ , cmake , curl , fetchFromGitHub -, ffmpeg +, ffmpeg_7-headless , gnutls , lame , lib @@ -29,15 +29,18 @@ , coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio }: +let + ffmpeg = ffmpeg_7-headless; +in stdenv.mkDerivation rec { pname = "musikcube"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - hash = "sha512-IakZy6XsAE39awjzQI+R11JCPeQSaibx6+uX8Iea5WdlCundeovnPwSAi6RzzZl9dr2UftzzEiF4Aun8VMtqVA=="; + hash = "sha512-Yqh35hyGzGZlh4UoHK0MGYBa+zugYJg3F+8F223saTdDChiX4cSncroSTexRyJVGm7EE8INNJoXg3HU6bZ08lA=="; }; outputs = [ "out" "dev" ]; From ad5271f7459ff5fcb8ccd7612969dd627e3f8c51 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 8 Jul 2024 11:14:25 +0200 Subject: [PATCH 2/4] musikcube: move to pkgs/by-name --- .../default.nix => by-name/mu/musikcube/package.nix} | 11 +++++------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/audio/musikcube/default.nix => by-name/mu/musikcube/package.nix} (87%) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/by-name/mu/musikcube/package.nix similarity index 87% rename from pkgs/applications/audio/musikcube/default.nix rename to pkgs/by-name/mu/musikcube/package.nix index 1496f3065198..8e3d950a9200 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -24,9 +24,8 @@ , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # Darwin Dependencies -, Cocoa -, SystemConfiguration -, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio +, darwin +, coreaudioSupport ? stdenv.hostPlatform.isDarwin }: let @@ -68,11 +67,11 @@ stdenv.mkDerivation rec { systemd ] ++ lib.optionals stdenv.isLinux [ alsa-lib pulseaudio - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa SystemConfiguration - ] ++ lib.optionals coreaudioSupport [ + ]) ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio - ] ++ lib.optionals sndioSupport [ + ]) ++ lib.optionals sndioSupport [ sndio ] ++ lib.optionals pipewireSupport [ pipewire diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b811e1b5b70..84e6d2ef5c79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31365,10 +31365,6 @@ with pkgs; meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - musikcube = callPackage ../applications/audio/musikcube { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio SystemConfiguration; - }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; From bf091dbb5f9266f65ef85c7dab9c29ab9e0ca04a Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 8 Jul 2024 11:17:32 +0200 Subject: [PATCH 3/4] musikcube: reformat using nixfmt --- pkgs/by-name/mu/musikcube/package.nix | 131 ++++++++++++++------------ 1 file changed, 71 insertions(+), 60 deletions(-) diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 8e3d950a9200..28a97cabc057 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -1,31 +1,34 @@ -{ asio -, cmake -, curl -, fetchFromGitHub -, ffmpeg_7-headless -, gnutls -, lame -, lib -, libev -, game-music-emu -, libmicrohttpd -, libopenmpt -, mpg123 -, ncurses -, pkg-config -, portaudio -, stdenv -, taglib -# Linux Dependencies -, alsa-lib -, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire -, pulseaudio -, sndioSupport ? true, sndio -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd -# Darwin Dependencies -, darwin -, coreaudioSupport ? stdenv.hostPlatform.isDarwin +{ + asio, + cmake, + curl, + fetchFromGitHub, + ffmpeg_7-headless, + gnutls, + lame, + lib, + libev, + game-music-emu, + libmicrohttpd, + libopenmpt, + mpg123, + ncurses, + pkg-config, + portaudio, + stdenv, + taglib, + # Linux Dependencies + alsa-lib, + pipewireSupport ? !stdenv.hostPlatform.isDarwin, + pipewire, + pulseaudio, + sndioSupport ? true, + sndio, + systemd, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + # Darwin Dependencies + darwin, + coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: let @@ -42,44 +45,49 @@ stdenv.mkDerivation rec { hash = "sha512-Yqh35hyGzGZlh4UoHK0MGYBa+zugYJg3F+8F223saTdDChiX4cSncroSTexRyJVGm7EE8INNJoXg3HU6bZ08lA=="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - asio - curl - ffmpeg - gnutls - lame - libev - game-music-emu - libmicrohttpd - libopenmpt - mpg123 - ncurses - portaudio - taglib - ] ++ lib.optionals systemdSupport [ - systemd - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib pulseaudio - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa SystemConfiguration - ]) ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ - CoreAudio - ]) ++ lib.optionals sndioSupport [ - sndio - ] ++ lib.optionals pipewireSupport [ - pipewire - ]; + buildInputs = + [ + asio + curl + ffmpeg + gnutls + lame + libev + game-music-emu + libmicrohttpd + libopenmpt + mpg123 + ncurses + portaudio + taglib + ] + ++ lib.optionals systemdSupport [ systemd ] + ++ lib.optionals stdenv.isLinux [ + alsa-lib + pulseaudio + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Cocoa + SystemConfiguration + ] + ) + ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio ]) + ++ lib.optionals sndioSupport [ sndio ] + ++ lib.optionals pipewireSupport [ pipewire ]; - cmakeFlags = [ - "-DDISABLE_STRIP=true" - ]; + cmakeFlags = [ "-DDISABLE_STRIP=true" ]; postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} @@ -89,7 +97,10 @@ stdenv.mkDerivation rec { meta = { description = "Terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; - maintainers = with lib.maintainers; [ aanderse afh ]; + maintainers = with lib.maintainers; [ + aanderse + afh + ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; From d801915b529bd03ef853555176e3cfaf44ab563e Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 8 Jul 2024 11:18:56 +0200 Subject: [PATCH 4/4] musikcube: modernize --- pkgs/by-name/mu/musikcube/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 28a97cabc057..af318e978122 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -34,14 +34,14 @@ let ffmpeg = ffmpeg_7-headless; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "musikcube"; version = "3.0.3"; src = fetchFromGitHub { owner = "clangen"; - repo = pname; - rev = version; + repo = "musikcube"; + rev = finalAttrs.version; hash = "sha512-Yqh35hyGzGZlh4UoHK0MGYBa+zugYJg3F+8F223saTdDChiX4cSncroSTexRyJVGm7EE8INNJoXg3HU6bZ08lA=="; }; @@ -90,8 +90,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDISABLE_STRIP=true" ]; postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d + install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcube + install_name_tool -add_rpath $out/share/musikcube $out/share/musikcube/musikcubed ''; meta = { @@ -101,7 +101,8 @@ stdenv.mkDerivation rec { aanderse afh ]; + mainProgram = "musikcube"; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +})