From f3c9ec6a58974fa7dd19130fa97af2738a8e205c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Thu, 26 Jun 2025 16:10:30 -0600 Subject: [PATCH] wip: fuck --- .gitignore | 2 ++ flake.nix | 17 +++++++++++++++++ pkgs/slippi-launcher/default.nix | 20 ++++++++++++++++++++ slippi-ld-log | 0 slippi-log | 30 ++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 slippi-ld-log create mode 100644 slippi-log diff --git a/.gitignore b/.gitignore index 7dc3520..8f293a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ result result-* + +slippi-ld-log.* \ No newline at end of file diff --git a/flake.nix b/flake.nix index 0749d98..da51666 100644 --- a/flake.nix +++ b/flake.nix @@ -19,5 +19,22 @@ lib.filterAttrs (_: v: lib.isDerivation v) self.legacyPackages.${system}); + + devShells.x86_64-linux.slippi = + let + pkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; + in self.packages.x86_64-linux.slippi-launcher.env.overrideAttrs + (final: prev: { + shellHook = + builtins.replaceStrings + ["exec \"\${cmd[@]}\""] + ['' + echo "''${cmd[-1]}" + unset cmd[-1] + cmd+=("$SHELL") + exec "''${cmd[@]}" + ''] + prev.shellHook; + }); }; } diff --git a/pkgs/slippi-launcher/default.nix b/pkgs/slippi-launcher/default.nix index 4c0907b..21a57b2 100644 --- a/pkgs/slippi-launcher/default.nix +++ b/pkgs/slippi-launcher/default.nix @@ -1,7 +1,10 @@ { lib , appimageTools , fetchurl +, fuse +, bash , breakpointHook +, makeWrapper }: appimageTools.wrapType2 rec { @@ -15,11 +18,28 @@ appimageTools.wrapType2 rec { nativeBuildInputs = [ breakpointHook + makeWrapper + ]; + + extraPkgs = pkgs: [ + pkgs.fuse + pkgs.bintools + pkgs.patchelf + ((pkgs.curl.override { + opensslSupport = true; + gnutlsSupport = false; + }).overrideAttrs (final: prev: { + meta.prio = lib.highPrio; + })) + pkgs.openssl ]; extraInstallCommands = '' + wrapProgram $out/bin/slippi-launcher \ + --set FUSERMOUNT_PROG "${fuse}/bin/fusermount" ''; + # note to madddy./.. DELETE "ubuntu is stupid" LINE FROM ~/.cache/appimage-run/XXXXX/shell-hooks/a meta = { description = "The way to play Slippi Online and watch replays."; homepage = "https://github.com/project-slippi/slippi-launcher"; diff --git a/slippi-ld-log b/slippi-ld-log new file mode 100644 index 0000000..e69de29 diff --git a/slippi-log b/slippi-log new file mode 100644 index 0000000..ada9049 --- /dev/null +++ b/slippi-log @@ -0,0 +1,30 @@ +20:37:29.048 (dolphin/ishiiInstallation) › Found existing netplay Dolphin executable. +20:37:29.048 (dolphin/ishiiInstallation) › Checking if we need to update netplay Dolphin +20:37:30.446 (dolphin/ishiiInstallation) › netplay Dolphin installation is outdated. Downloading latest... +20:37:30.447 › Downloading https://github.com/project-slippi/Ishiiruka/releases/download/v3.4.6/FM-Slippi-3.4.6-Linux.zip to /home/crumb/.config/Slippi Launcher/temp/FM-Slippi-3.4.6-Linux.zip +20:37:30.453 (dolphin/ishiiInstallation) › Found existing playback Dolphin executable. +20:37:30.453 (dolphin/ishiiInstallation) › Checking if we need to update playback Dolphin +20:37:31.131 (dolphin/ishiiInstallation) › playback Dolphin installation is outdated. Downloading latest... +20:37:31.132 › Downloading https://github.com/project-slippi/Ishiiruka-Playback/releases/download/v3.4.6/playback-3.4.6-Linux.zip to /home/crumb/.config/Slippi Launcher/temp/playback-3.4.6-Linux.zip +20:37:31.985 (main/github) › Checking cache for: https://api.github.com/repos/project-slippi/Ishiiruka/releases +20:37:31.986 (main/github) › Fetching: https://api.github.com/repos/project-slippi/Ishiiruka/releases +20:37:31.988 (main/github) › Checking cache for: https://api.github.com/repos/project-slippi/slippi-launcher/releases +20:37:31.988 (main/github) › Fetching: https://api.github.com/repos/project-slippi/slippi-launcher/releases +20:37:31.988 (main/github) › Checking cache for: https://api.github.com/repos/project-slippi/dolphin/releases +20:37:31.988 (main/github) › Fetching: https://api.github.com/repos/project-slippi/dolphin/releases +20:37:31.989 (main/bluesky) › Checking cache for: https://public.api.bsky.app/xrpc/app.bsky.feed.getAuthorFeed?actor=did%3Aplc%3A6xwud4csg7p7243ptrc5sa5y +20:37:31.990 (main/bluesky) › Fetching: https://public.api.bsky.app/xrpc/app.bsky.feed.getAuthorFeed?actor=did%3Aplc%3A6xwud4csg7p7243ptrc5sa5y +20:39:20.482 › Successfully downloaded https://github.com/project-slippi/Ishiiruka-Playback/releases/download/v3.4.6/playback-3.4.6-Linux.zip to /home/crumb/.config/Slippi Launcher/temp/playback-3.4.6-Linux.zip +20:39:20.483 (dolphin/ishiiInstallation) › Installing v3.4.6 playback Dolphin... +No existing AppImage found +Setting executable permissions... +20:39:21.943 (dolphin/ishiiInstallation) › Finished v3.4.6 playback Dolphin install +20:40:01.361 › Successfully downloaded https://github.com/project-slippi/Ishiiruka/releases/download/v3.4.6/FM-Slippi-3.4.6-Linux.zip to /home/crumb/.config/Slippi Launcher/temp/FM-Slippi-3.4.6-Linux.zip +20:40:01.361 (dolphin/ishiiInstallation) › Installing v3.4.6 netplay Dolphin... +No existing AppImage found +Setting executable permissions... +20:40:02.970 (dolphin/ishiiInstallation) › Finished v3.4.6 netplay Dolphin install +20:41:19.468 (dolphin/manager) › Launching dolphin at path: /home/crumb/.config/Slippi Launcher/netplay/Slippi_Online-x86_64.AppImage +20:41:20.049 (dolphin/manager) › Dolphin exit code: 1 +20:41:20.051 (dolphin/manager) › Dolphin exit signal: undefined +20:41:20.546 (dolphin/instance) › Received Dolphin stderr message: /home/crumb/.cache/appimage-run/f81347d3673372b3a06916cd7412c77faac6a150f71d60a972351fa56ed52521/AppRun.wrapped: /usr/lib/libcurl.so.4: version `CURL_OPENSSL_4' not found (required by /home/crumb/.cache/appimage-run/f81347d3673372b3a06916cd7412c77faac6a150f71d60a972351fa56ed52521/AppRun.wrapped) \ No newline at end of file