From 7836a7329671b739fd27ff7080b65ab899e4ff11 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sun, 19 Oct 2025 11:36:01 -0700 Subject: [PATCH] padthv1: move to by-name/ --- .../qs/qsynth/package.nix} | 25 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 16 deletions(-) rename pkgs/{applications/audio/qsynth/default.nix => by-name/qs/qsynth/package.nix} (61%) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/by-name/qs/qsynth/package.nix similarity index 61% rename from pkgs/applications/audio/qsynth/default.nix rename to pkgs/by-name/qs/qsynth/package.nix index 2b73e80a1732..310ce39a4550 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/by-name/qs/qsynth/package.nix @@ -7,42 +7,39 @@ libjack2, cmake, pkg-config, - qtbase, - qttools, - qtx11extras, - wrapQtAppsHook, + libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qsynth"; version = "1.0.3"; src = fetchurl { - url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qsynth/qsynth-${finalAttrs.version}.tar.gz"; hash = "sha256-z4l+Ku3oEQV3NunkogyxzaSKhFJuYhIxlExJsACcumY="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib fluidsynth libjack2 - qtbase - qttools - qtx11extras + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtx11extras ]; - meta = with lib; { + meta = { description = "Fluidsynth GUI"; mainProgram = "qsynth"; homepage = "https://sourceforge.net/projects/qsynth"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d7df523b0c5..0fcde01139ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12253,8 +12253,6 @@ with pkgs; qsudo = libsForQt5.callPackage ../applications/misc/qsudo { }; - qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; - qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { }; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };