diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/by-name/cs/csound-qt/package.nix similarity index 81% rename from pkgs/applications/audio/csound/csound-qt/default.nix rename to pkgs/by-name/cs/csound-qt/package.nix index 9ff6bb2de902..1ef8907eaf19 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/by-name/cs/csound-qt/package.nix @@ -6,21 +6,18 @@ fetchFromGitHub, python3, python-qt, - qmake, - qtwebengine, - qtxmlpatterns, rtmidi, - wrapQtAppsHook, + libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csound-qt"; version = "1.1.3"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk="; }; @@ -28,7 +25,7 @@ stdenv.mkDerivation rec { ./rtmidipath.patch ]; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake qtwebengine qtxmlpatterns @@ -59,11 +56,11 @@ stdenv.mkDerivation rec { "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; - meta = with lib; { + meta = { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ hlolli ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hlolli ]; }; -} +}) diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/by-name/cs/csound-qt/rtmidipath.patch similarity index 100% rename from pkgs/applications/audio/csound/csound-qt/rtmidipath.patch rename to pkgs/by-name/cs/csound-qt/rtmidipath.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fcde01139ea..e17dbe4f5c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10893,8 +10893,6 @@ with pkgs; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { }; - codeblocksFull = codeblocks.override { contribPlugins = true; }; cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };