From 7561a1ec8d11733762cfe57e108793f3498e29dd Mon Sep 17 00:00:00 2001 From: Juul-Mc-Goa Date: Thu, 1 May 2025 13:40:08 +0200 Subject: [PATCH 1/3] libdjinterop: 0.22.1 -> 0.24.3 Required when updating mixxx. --- pkgs/by-name/li/libdjinterop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdjinterop/package.nix b/pkgs/by-name/li/libdjinterop/package.nix index 0b514a34a209..c5a6c7d76f78 100644 --- a/pkgs/by-name/li/libdjinterop/package.nix +++ b/pkgs/by-name/li/libdjinterop/package.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "xsco"; repo = "libdjinterop"; - rev = "0.22.1"; - hash = "sha256-x0GbuUDmx8ooiaD/8J5VvIG239d5uDdK5H1tnwHd62c="; + rev = "0.24.3"; + hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw="; }; nativeBuildInputs = [ From 5b779fab1effb31ad2b9c588ff12aa75039234d7 Mon Sep 17 00:00:00 2001 From: Juul-Mc-Goa Date: Thu, 1 May 2025 13:44:47 +0200 Subject: [PATCH 2/3] mixxx: 2.5.0 -> specific commit Pin mixxx to the commit solving the build issue. Add a cmake flag. --- pkgs/applications/audio/mixxx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 8c9022df6eca..3c22cdbe3ffe 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; - rev = version; - hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M="; + rev = "9e3f9bfbac5c6fde7c4ee5fed2b550aa62060a95"; + hash = "sha256-9z4UqmXR/n1CCr1/YzTNl5SdRgbZgN/i1JNfA4TLaXU="; }; nativeBuildInputs = [ @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { # see https://github.com/mixxxdj/mixxx/blob/2.3.5/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" + # "BUILD_TESTING=OFF" must imply "BUILD_BENCH=OFF" + "-DBUILD_BENCH=OFF" ]; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' From 15dab23a42759a33cb4288fd17195d5fc09aeab2 Mon Sep 17 00:00:00 2001 From: Juul-Mc-Goa Date: Thu, 1 May 2025 17:46:05 +0200 Subject: [PATCH 3/3] mixxx: 2.5.0 -> 2.5.1 --- pkgs/applications/audio/mixxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 3c22cdbe3ffe..fd404d0e2b45 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { pname = "mixxx"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; - rev = "9e3f9bfbac5c6fde7c4ee5fed2b550aa62060a95"; - hash = "sha256-9z4UqmXR/n1CCr1/YzTNl5SdRgbZgN/i1JNfA4TLaXU="; + rev = version; + hash = "sha256-s66XrcMGgA8KvBDxljg95nbKW1pIv8rJJ+DyxirHwDo="; }; nativeBuildInputs = [