From 93a4d40e735cefb0799165ffec0cd6b9d2ab2512 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 7 Aug 2024 18:21:41 +0200 Subject: [PATCH 1/2] maintainers: add theredstonedev --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 70b4b15b8710..e907eaefc775 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22207,6 +22207,13 @@ name = "Rouven Seifert"; keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; } ]; }; + theredstonedev = { + email = "theredstonedev@devellight.space"; + matrix = "@theredstonedev_de:matrix.devellight.space"; + github = "TheRedstoneDEV-DE"; + githubId = 75328096; + name = "Robert Richter"; + }; therishidesai = { email = "desai.rishi1@gmail.com"; github = "therishidesai"; From 99df3b541cfadd5a65ad90fd5a53ec01643dd998 Mon Sep 17 00:00:00 2001 From: TheDeveloper3 Date: Sat, 13 Jul 2024 20:05:59 +0200 Subject: [PATCH 2/2] drumkv1: 0.9.23 -> 1.0.0 (+fix LV2 Qt UI issues) --- pkgs/applications/audio/drumkv1/default.nix | 50 +++++++++++++++++---- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 345116e93825..440676b14e5e 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,17 +1,51 @@ -{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5 }: +{ + stdenv, + lib, + pkg-config, + fetchurl, + cmake, + libjack2, + alsa-lib, + libsndfile, + liblo, + lv2, + qt6, + xorg, +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "drumkv1"; - version = "0.9.23"; + version = "1.0.0"; src = fetchurl { - url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "sha256-gNscsqGpEfU1CNJDlBAzum9M0vzJSm6Wx5b/zhOt+sk="; + url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz"; + hash = "sha256-vi//84boqaVxC/KCg+HF76vB4Opch02LU4RtbVaxaX4="; }; - buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; + buildInputs = [ + libjack2 + alsa-lib + libsndfile + liblo + lv2 + xorg.libX11 + qt6.qtbase + qt6.qtwayland + qt6.qtsvg + ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + cmake + qt6.wrapQtAppsHook + ]; + + cmakeFlags = [ + # disable experimental feature "LV2 port change request" + "-DCONFIG_LV2_PORT_CHANGE_REQUEST=false" + # override libdir -- temporary until upstream fixes CMakeLists.txt + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Old-school drum-kit sampler synthesizer with stereo fx"; @@ -19,6 +53,6 @@ mkDerivation rec { homepage = "http://drumkv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = [ maintainers.theredstonedev ]; }; }