From f4ec3db3f4ffbe83f3fe99f814a2f4141d96d099 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 20 Oct 2025 19:08:04 -0700 Subject: [PATCH] qmidinet: modernize, move to by-name/ --- .../qm/qmidinet/package.nix} | 28 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 15 deletions(-) rename pkgs/{applications/audio/qmidinet/default.nix => by-name/qm/qmidinet/package.nix} (55%) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/by-name/qm/qmidinet/package.nix similarity index 55% rename from pkgs/applications/audio/qmidinet/default.nix rename to pkgs/by-name/qm/qmidinet/package.nix index 782ddc613260..ba981125e1ac 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/by-name/qm/qmidinet/package.nix @@ -1,40 +1,42 @@ { - mkDerivation, + stdenv, lib, fetchurl, pkg-config, - qtbase, - qttools, alsa-lib, libjack2, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.4"; pname = "qmidinet"; src = fetchurl { - url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz"; sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0="; }; hardeningDisable = [ "format" ]; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools alsa-lib libjack2 ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + libsForQt5.wrapQtAppsHook + ]; - meta = with lib; { + meta = { description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; mainProgram = "qmidinet"; homepage = "http://qmidinet.sourceforge.net/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a820d305ac35..575e54cfa88f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12218,8 +12218,6 @@ with pkgs; qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; - qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };