From af3091eccaf18eda979a26b951e556eb4ce232b8 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Thu, 9 Apr 2026 15:45:56 -0500 Subject: [PATCH] faugus-launcher: 1.16.6 -> 1.20.4 --- pkgs/by-name/fa/faugus-launcher/package.nix | 25 ++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 28272dffb513..d642b2daf4a6 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -6,26 +6,27 @@ lib, libayatana-appindicator, libcanberra-gtk3, + lsfg-vk, meson, ninja, nix-update-script, python3Packages, umu-launcher, - lsfg-vk, + vulkan-tools, wrapGAppsHook3, xdg-utils, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "faugus-launcher"; - version = "1.16.6"; + version = "1.20.4"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = finalAttrs.version; - hash = "sha256-VVLq11jq7fGKgQske/FnQEkwcneuKWOvXFr4eUGHYTw="; + hash = "sha256-Kt6ZZ5yivbRzlgV+ovWiZVolxjmquAifJ/0lk1oL4fA="; }; nativeBuildInputs = [ @@ -42,24 +43,25 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ pillow psutil + pygame pygobject3 requests vdf ]; postPatch = '' - substituteInPlace faugus_launcher.py \ - --replace-fail "PathManager.find_binary('faugus-run')" "'$out/bin/.faugus-run-wrapped'" \ - --replace-fail "PathManager.find_binary('faugus-proton-manager')" "'$out/bin/.faugus-proton-manager-wrapped'" \ + substituteInPlace faugus-launcher \ + --replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}" + + substituteInPlace faugus/launcher.py \ --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \ --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \ - --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \ - --replace-fail 'Exec={faugus_run}' 'Exec=faugus-run' + --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" - substituteInPlace faugus_run.py \ + substituteInPlace faugus/runner.py \ --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" - substituteInPlace faugus_shortcut.py \ + substituteInPlace faugus/shortcut.py \ --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \ --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" ''; @@ -69,16 +71,19 @@ python3Packages.buildPythonApplication (finalAttrs: { preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" + --suffix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH" --suffix PATH : "${ lib.makeBinPath [ icoextract imagemagick libcanberra-gtk3 umu-launcher + vulkan-tools xdg-utils ] }" ) + wrapProgram $out/bin/faugus-launcher ''${makeWrapperArgs[@]} ''; passthru.updateScript = nix-update-script { };