From ffa273ca0cdd894176abd4e1040b94dda88d94a3 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 20 Oct 2025 19:21:42 -0700 Subject: [PATCH] qsampler: modernize, move to by-name/ --- .../qs/qsampler/package.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) rename pkgs/{applications/audio/qsampler/default.nix => by-name/qs/qsampler/package.nix} (66%) diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/by-name/qs/qsampler/package.nix similarity index 66% rename from pkgs/applications/audio/qsampler/default.nix rename to pkgs/by-name/qs/qsampler/package.nix index 46e7a5c7fea3..1abc916de994 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/by-name/qs/qsampler/package.nix @@ -1,23 +1,22 @@ { lib, + stdenv, fetchurl, autoconf, automake, libtool, pkg-config, - qttools, liblscp, libgig, - qtbase, - mkDerivation, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qsampler"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qsampler/qsampler-${finalAttrs.version}.tar.gz"; sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; @@ -26,24 +25,25 @@ mkDerivation rec { automake libtool pkg-config - qttools + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ liblscp libgig - qtbase + libsForQt5.qtbase ]; preConfigure = "make -f Makefile.svn"; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "http://www.linuxsampler.org"; description = "Graphical frontend to LinuxSampler"; mainProgram = "qsampler"; - license = licenses.gpl2; + license = lib.licenses.gpl2; 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 4ce134137a6e..77825ef64ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12218,8 +12218,6 @@ with pkgs; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; - qsstv = qt5.callPackage ../applications/radio/qsstv { }; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };