From ed5d911fafe738234b1046b7d611cfc665d80e74 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 21 Oct 2025 13:34:57 -0700 Subject: [PATCH] pragha: modernize, move to by-name/ --- .../pr/pragha/package.nix} | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 15 deletions(-) rename pkgs/{applications/audio/pragha/default.nix => by-name/pr/pragha/package.nix} (83%) diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/by-name/pr/pragha/package.nix similarity index 83% rename from pkgs/applications/audio/pragha/default.nix rename to pkgs/by-name/pr/pragha/package.nix index a96b037d8c5b..067359851eb7 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -1,14 +1,13 @@ { lib, + stdenv, intltool, - mkDerivation, installShellFiles, pkg-config, fetchFromGitHub, dbus-glib, desktop-file-utils, hicolor-icon-theme, - qtbase, sqlite, taglib, zlib, @@ -17,6 +16,7 @@ libcddb, libcdio, gst_all_1, + libsForQt5, withGstPlugins ? true, glyr, withGlyr ? true, @@ -45,15 +45,15 @@ assert withGlyr -> withLastfm; assert withLastfm -> withCD; -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pragha"; version = "1.3.99.1"; src = fetchFromGitHub { owner = "pragha-music-player"; repo = "pragha"; - rev = "v${version}"; - sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ mkDerivation rec { xfce.xfce4-dev-tools desktop-file-utils installShellFiles + libsForQt5.wrapQtAppsHook ]; buildInputs = @@ -73,7 +74,7 @@ mkDerivation rec { gtk3 hicolor-icon-theme libpeas - qtbase + libsForQt5.qtbase sqlite taglib zlib @@ -108,17 +109,17 @@ mkDerivation rec { postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - install -m 444 data/${pname}.desktop $out/share/applications + install -m 444 data/pragha.desktop $out/share/applications install -d $out/share/pixmaps - installManPage data/${pname}.1 + installManPage data/pragha.1 ''; - meta = with lib; { + meta = { description = "Lightweight GTK+ music manager - fork of Consonance Music Manager"; mainProgram = "pragha"; homepage = "https://pragha-music-player.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mbaeten ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mbaeten ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 139fcdbf8766..104ff7b6ca1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11858,8 +11858,6 @@ with pkgs; withConplay = false; }; - pragha = libsForQt5.callPackage ../applications/audio/pragha { }; - rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {