From a10bb7134bd5684d019f02c146a5065c4cee151f Mon Sep 17 00:00:00 2001 From: "JS (normalc/ea)" Date: Thu, 15 May 2025 14:10:18 -0400 Subject: [PATCH] =?UTF-8?q?parabolic:=202025.1.4=20=E2=86=92=202025.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/pa/parabolic/package.nix | 40 +++++++++++++++++++-------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index 4f7c4b109e7b..b204f89c24b2 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -7,6 +7,7 @@ itstool, ninja, yelp-tools, + desktop-file-utils, pkg-config, libnick, boost, @@ -18,6 +19,8 @@ libxmlxx5, blueprint-compiler, qt6, + qlementine, + qlementine-icons, yt-dlp, ffmpeg, aria2, @@ -31,13 +34,13 @@ assert lib.assertOneOf "uiPlatform" uiPlatform [ stdenv.mkDerivation (finalAttrs: { pname = "parabolic"; - version = "2025.1.4"; + version = "2025.5.4"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Parabolic"; tag = finalAttrs.version; - hash = "sha256-B8/e5urhy5tAgHNd/PR3HlNQd0M0CxgC56nArFGlQ9c="; + hash = "sha256-2CFV9//8gFK1TYksdy9P4nLb7kj/8Q5dr5huoAuDNRs="; }; # Patches desktop file/dbus service bypassing wrapped executable @@ -59,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config itstool yelp-tools + desktop-file-utils ] ++ lib.optionals (uiPlatform == "gnome") [ wrapGAppsHook4 @@ -76,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (uiPlatform == "qt") [ qt6.qtbase qt6.qtsvg + qlementine + qlementine-icons ] ++ lib.optionals (uiPlatform == "gnome") [ glib @@ -88,16 +94,28 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "UI_PLATFORM" uiPlatform) ]; + dontWrapGApps = true; + dontWrapQtApps = true; + preFixup = - lib.optionalString (uiPlatform == "gnome") "gappsWrapperArgs" - + lib.optionalString (uiPlatform == "qt") "qtWrapperArgs" - + "+=(--prefix PATH : ${ - lib.makeBinPath [ - aria2 - ffmpeg - yt-dlp - ] - })"; + lib.optionalString (uiPlatform == "gnome") '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + '' + + lib.optionalString (uiPlatform == "qt") '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + '' + + '' + makeWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + aria2 + ffmpeg + yt-dlp + ] + }) + + wrapProgram $out/bin/org.nickvision.tubeconverter \ + ''${makeWrapperArgs[@]} + ''; passthru.updateScript = nix-update-script { };