diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/by-name/pi/pipecontrol/package.nix similarity index 61% rename from pkgs/applications/audio/pipecontrol/default.nix rename to pkgs/by-name/pi/pipecontrol/package.nix index 2c29dd4b2ccb..7dbdf94f9fd3 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/by-name/pi/pipecontrol/package.nix @@ -5,47 +5,43 @@ pipewire, cmake, extra-cmake-modules, - wrapQtAppsHook, - qtbase, - qttools, - kirigami2, - kcoreaddons, - ki18n, - qtquickcontrols2, + libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pipecontrol"; version = "0.2.12"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = "pipecontrol"; - rev = "v${version}"; - sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; }; nativeBuildInputs = [ cmake extra-cmake-modules - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ pipewire + ] + ++ (with libsForQt5; [ qtbase kirigami2 kcoreaddons ki18n qtquickcontrols2 - ]; + ]); - meta = with lib; { + meta = { description = "Pipewire control GUI program in Qt (Kirigami2)"; mainProgram = "pipecontrol"; homepage = "https://github.com/portaloffreedom/pipecontrol"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ tilcreator ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tilcreator ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58e1df9f9952..8e6fe706bbc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3741,8 +3741,6 @@ with pkgs; percona-xtrabackup ; - pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { }; - pulumiPackages = recurseIntoAttrs pulumi.pkgs; pulumi-bin = callPackage ../tools/admin/pulumi-bin { };