Add back duckstation.

Switch to bundled packages to fix build.
Add Spaghetti Kart to the Steam Deck.
2025-09-13 12:28:29 -04:00 · 2025-09-13 12:00:09 -04:00 · 2025-09-13 11:28:29 -04:00 · 2025-09-12 19:02:22 -04:00
29 changed files with 1426 additions and 20 deletions
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@ -61,6 +61,7 @@
    ./roles/sm64ex
    ./roles/sops
    ./roles/sound
+    ./roles/spaghettikart
    ./roles/ssh
    ./roles/steam
    ./roles/steam_run_free
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@ -96,6 +96,7 @@
  me.shikane.enable = true;
  me.sops.enable = true;
  me.sound.enable = true;
+  me.spaghettikart.enable = true;
  me.steam.enable = true;
  me.steam_run_free.enable = true;
  me.sway.enable = true;
--- a/nix/configuration/hosts/quark/default.nix
+++ b/nix/configuration/hosts/quark/default.nix
@ -92,6 +92,7 @@
    me.shikane.enable = true;
    me.sops.enable = true;
    me.sound.enable = true;
+    me.spaghettikart.enable = true;
    me.steam.enable = true;
    me.steam_run_free.enable = true;
    me.sway.enable = true;
--- a/nix/configuration/roles/spaghettikart/default.nix
+++ b/nix/configuration/roles/spaghettikart/default.nix
@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  options.me = {
+    spaghettikart.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install spaghettikart.";
+    };
+  };
+
+  config = lib.mkIf config.me.spaghettikart.enable (
+    lib.mkMerge [
+      {
+        allowedUnfree = [ "spaghettikart" ];
+      }
+      (lib.mkIf config.me.graphical {
+        environment.systemPackages = with pkgs; [
+          spaghettikart
+        ];
+
+        me.install.user.talexander.file = {
+          ".local/share/spaghettikart/spaghettify.cfg.json" = {
+            source = ./files/spaghettify.cfg.json;
+            method = "overwrite";
+          };
+        };
+
+        environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
+          hideMounts = true;
+          users.talexander = {
+            files = [
+              ".local/share/spaghettikart/default.sav"
+              ".local/share/spaghettikart/mk64.o2r"
+            ];
+          };
+        };
+      })
+    ]
+  );
+}
--- a/nix/configuration/roles/spaghettikart/files/spaghettify.cfg.json
+++ b/nix/configuration/roles/spaghettikart/files/spaghettify.cfg.json
@ -0,0 +1,14 @@
+{
+  "CVars": {
+    "gDisableLod": 1,
+    "gMSAAValue": 2,
+    "gShowSpaghettiVersion": 0,
+    "gSkipIntro": 1,
+    "gVsyncEnabled": 1
+  },
+  "Window": {
+    "Fullscreen": {
+      "Enabled": true
+    }
+  }
+}
--- a/nix/steam_deck/configuration/flake.lock
+++ b/nix/steam_deck/configuration/flake.lock
@ -1,12 +1,15 @@
 {
  "nodes": {
    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -22,11 +25,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739314552,
-        "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=",
+        "lastModified": 1757698511,
+        "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd",
+        "rev": "a3fcc92180c7462082cd849498369591dfb20855",
        "type": "github"
      },
      "original": {
@ -58,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713543440,
-        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "lastModified": 1752054764,
+        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
        "owner": "nix-community",
        "repo": "nixGL",
-        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
        "type": "github"
      },
      "original": {
@ -73,11 +76,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1739138025,
-        "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
+        "lastModified": 1757746433,
+        "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
+        "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d",
        "type": "github"
      },
      "original": {
@ -94,6 +97,21 @@
        "nixgl": "nixgl",
        "nixpkgs": "nixpkgs"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/nix/steam_deck/configuration/flake.nix
+++ b/nix/steam_deck/configuration/flake.nix
@ -4,8 +4,10 @@

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixgl.url = "github:nix-community/nixGL";
-    nixgl.inputs.nixpkgs.follows = "nixpkgs";
+    nixgl = {
+      url = "github:nix-community/nixGL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -23,6 +25,7 @@
      ...
    }:
    let
+      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
      system = "x86_64-linux";
      pkgs = import nixpkgs {
        inherit system;
@ -31,7 +34,7 @@
    in
    # pkgs = nixpkgs.legacyPackages.${system};
    {
-      defaultPackage.${system} = home-manager.defaultPackage.${system};
+      defaultPackage.${system} = home-manager.packages.${system}.default;
      homeConfigurations."deck" = home-manager.lib.homeManagerConfiguration {
        inherit pkgs;

--- a/nix/steam_deck/configuration/home.nix
+++ b/nix/steam_deck/configuration/home.nix
@ -18,6 +18,7 @@
    ./roles/ryujinx
    ./roles/shipwright
    ./roles/sm64ex
+    ./roles/spaghettikart
    ./roles/steam_rom_manager
    ./roles/yuzu
    ./util/copy_files
--- a/nix/steam_deck/configuration/hosts/deck/default.nix
+++ b/nix/steam_deck/configuration/hosts/deck/default.nix
@ -20,6 +20,7 @@
    me.ship2harkinian.enable = true;
    me.shipwright.enable = true;
    me.sm64ex.enable = true;
+    me.spaghettikart.enable = true;
    me.steam_rom_manager.enable = true; # Steam rom manager UI does not render. I think it wants to be in an AppImage.
    me.yuzu.enable = true;
  };
--- a/nix/steam_deck/configuration/roles/duckstation/default.nix
+++ b/nix/steam_deck/configuration/roles/duckstation/default.nix
@ -51,6 +51,7 @@ in
          (
            final: prev:
            let
+              modified_package = (pkgs.callPackage ./package/package.nix { });
              optimizeWithFlags =
                pkg: flags:
                pkg.overrideAttrs (old: {
@ -58,16 +59,16 @@ in
                });
              original_package =
                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.duckstation [
+                  (optimizeWithFlags modified_package [
                    "-march=znver2"
                    "-mtune=znver2"
                  ])
                else
-                  prev.duckstation;
+                  modified_package;
            in
            {
              duckstation = pkgs.buildEnv {
-                name = prev.duckstation.name;
+                name = original_package.name;
                paths = [
                  (config.lib.nixGL.wrap original_package)
                ];
--- a/nix/steam_deck/configuration/roles/duckstation/package/001-fix-test-inclusion.diff
+++ b/nix/steam_deck/configuration/roles/duckstation/package/001-fix-test-inclusion.diff
@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 879d46bc..95570f6b 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -20,5 +20,5 @@ if(BUILD_REGTEST)
+ endif()
+ 
+ if(BUILD_TESTS)
+-  add_subdirectory(common-tests EXCLUDE_FROM_ALL)
+  add_subdirectory(common-tests)
+ endif()
--- a/nix/steam_deck/configuration/roles/duckstation/package/002-hardcode-vars.diff
+++ b/nix/steam_deck/configuration/roles/duckstation/package/002-hardcode-vars.diff
@ -0,0 +1,19 @@
+diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh
+index 9122cd8..50ed8f9 100755
+--- a/src/scmversion/gen_scmversion.sh
+++ b/src/scmversion/gen_scmversion.sh
+@@ -10,10 +10,10 @@ else
+ fi
+ 
+ 
+-HASH=$(git rev-parse HEAD)
+-BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
+-TAG=$(git describe --dirty | tr -d '\r\n')
+-DATE=$(git log -1 --date=iso8601-strict --format=%cd)
+HASH="@gitHash@"
+BRANCH="@gitBranch@"
+TAG="@gitTag@"
+DATE="@gitDate@"
+ 
+ cd $CURDIR
+ 
--- a/nix/steam_deck/configuration/roles/duckstation/package/003-fix-NEON-intrinsics.patch
+++ b/nix/steam_deck/configuration/roles/duckstation/package/003-fix-NEON-intrinsics.patch
@ -0,0 +1,70 @@
+From 19e094e5c7aaaf375a13424044521701e85c8313 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Thu, 9 Jan 2025 17:46:25 +0100
+Subject: [PATCH] Fix usage of NEON intrinsics
+
+---
+ src/common/gsvector_neon.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h
+index e4991af5e..61b8dc09b 100644
+--- a/src/common/gsvector_neon.h
+++ b/src/common/gsvector_neon.h
+@@ -867,7 +867,7 @@ public:
+ 
+   ALWAYS_INLINE int mask() const
+   {
+-    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31);
+    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31);
+     return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1));
+   }
+ 
+@@ -2882,7 +2882,7 @@ public:
+   ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const
+   {
+ #ifdef CPU_ARCH_ARM64
+-    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+ #else
+     GSVector4 ret;
+     ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
+@@ -2894,7 +2894,7 @@ public:
+   ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const
+   {
+ #ifdef CPU_ARCH_ARM64
+-    return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+    return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+ #else
+     GSVector4 ret;
+     ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
+@@ -2906,7 +2906,7 @@ public:
+   ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const
+   {
+ #ifdef CPU_ARCH_ARM64
+-    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+ #else
+     GSVector4 ret;
+     ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
+@@ -2918,7 +2918,7 @@ public:
+   ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const
+   {
+ #ifdef CPU_ARCH_ARM64
+-    return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+    return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+ #else
+     GSVector4 ret;
+     ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
+@@ -2930,7 +2930,7 @@ public:
+   ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const
+   {
+ #ifdef CPU_ARCH_ARM64
+-    return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+    return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));
+ #else
+     GSVector4 ret;
+     ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;
+-- 
+2.47.0
+
--- a/nix/steam_deck/configuration/roles/duckstation/package/LICENSE
+++ b/nix/steam_deck/configuration/roles/duckstation/package/LICENSE
@ -0,0 +1,26 @@
+# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
+#
+# They have slight modifications to fix the package build on my home-manager systems.
+#
+# The original license is reproduced below:
+
+Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/nix/steam_deck/configuration/roles/duckstation/package/package.nix
+++ b/nix/steam_deck/configuration/roles/duckstation/package/package.nix
@ -0,0 +1,147 @@
+{
+  lib,
+  stdenv,
+  llvmPackages,
+  SDL2,
+  callPackage,
+  cmake,
+  cpuinfo,
+  cubeb,
+  curl,
+  extra-cmake-modules,
+  libXrandr,
+  libbacktrace,
+  libwebp,
+  makeWrapper,
+  ninja,
+  pkg-config,
+  qt6,
+  vulkan-loader,
+  wayland,
+  wayland-scanner,
+}:
+
+let
+  sources = callPackage ./sources.nix { };
+  inherit (qt6)
+    qtbase
+    qtsvg
+    qttools
+    qtwayland
+    wrapQtAppsHook
+    ;
+in
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
+  inherit (sources.duckstation) pname version src;
+
+  patches = [
+    # Tests are not built by default
+    ./001-fix-test-inclusion.diff
+    # Patching yet another script that fills data based on git commands . . .
+    ./002-hardcode-vars.diff
+    # Fix NEON intrinsics usage
+    ./003-fix-NEON-intrinsics.patch
+    ./remove-cubeb-vendor.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    ninja
+    pkg-config
+    qttools
+    wayland-scanner
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    SDL2
+    cpuinfo
+    cubeb
+    curl
+    libXrandr
+    libbacktrace
+    libwebp
+    qtbase
+    qtsvg
+    qtwayland
+    sources.discord-rpc-patched
+    sources.lunasvg
+    sources.shaderc-patched
+    sources.soundtouch-patched
+    sources.spirv-cross-patched
+    wayland
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTS" true)
+  ];
+
+  strictDeps = true;
+
+  doInstallCheck = true;
+
+  postPatch = ''
+    gitHash=$(cat .nixpkgs-auxfiles/git_hash) \
+    gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \
+    gitTag=$(cat .nixpkgs-auxfiles/git_tag) \
+    gitDate=$(cat .nixpkgs-auxfiles/git_date) \
+      substituteAllInPlace src/scmversion/gen_scmversion.sh
+  '';
+
+  # error: cannot convert 'int16x8_t' to '__Int32x4_t'
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/share/duckstation/common-tests
+
+    runHook postInstallCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share
+
+    cp -r bin $out/share/duckstation
+    ln -s $out/share/duckstation/duckstation-qt $out/bin/
+
+    install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop
+    install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png
+
+    runHook postInstall
+  '';
+
+  qtWrapperArgs =
+    let
+      libPath = lib.makeLibraryPath ([
+        sources.shaderc-patched
+        sources.spirv-cross-patched
+        vulkan-loader
+      ]);
+    in
+    [
+      "--prefix LD_LIBRARY_PATH : ${libPath}"
+    ];
+
+  # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh
+  # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run
+  postFixup = ''
+    source "${makeWrapper}/nix-support/setup-hook"
+    wrapProgram $out/bin/duckstation-qt \
+      --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi'
+  '';
+
+  meta = {
+    homepage = "https://github.com/stenzek/duckstation";
+    description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "duckstation-qt";
+    maintainers = with lib.maintainers; [
+      guibou
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/nix/steam_deck/configuration/roles/duckstation/package/remove-cubeb-vendor.patch
+++ b/nix/steam_deck/configuration/roles/duckstation/package/remove-cubeb-vendor.patch
@ -0,0 +1,33 @@
+diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
+index af35687..8347825 100644
+--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
+@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(rcheevos)
+ add_subdirectory(rapidyaml EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(rapidyaml)
+-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+-disable_compiler_warnings_for_target(cubeb)
+-disable_compiler_warnings_for_target(speex)
+find_package(cubeb REQUIRED GLOBAL)
+add_library(cubeb ALIAS cubeb::cubeb)
+ add_subdirectory(kissfft EXCLUDE_FROM_ALL)
+ disable_compiler_warnings_for_target(kissfft)
+ 
+diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
+index 85579c4..339190a 100644
+--- a/src/util/cubeb_audio_stream.cpp
+++ b/src/util/cubeb_audio_stream.cpp
+@@ -261,9 +261,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+   std::vector<std::pair<std::string, std::string>> names;
+   names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
+ 
+-  const char** cubeb_names = cubeb_get_backend_names();
+-  for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+-    names.emplace_back(cubeb_names[i], cubeb_names[i]);
+  cubeb_backend_names backends = cubeb_get_backend_names();
+  for (u32 i = 0; i < backends.count; i++)
+    names.emplace_back(backends.names[i], backends.names[i]);
+   return names;
+ }
+
--- a/nix/steam_deck/configuration/roles/duckstation/package/shaderc-patched.nix
+++ b/nix/steam_deck/configuration/roles/duckstation/package/shaderc-patched.nix
@ -0,0 +1,20 @@
+{
+  fetchpatch,
+  duckstation,
+  shaderc,
+}:
+
+shaderc.overrideAttrs (old: {
+  pname = "shaderc-patched-for-duckstation";
+  patches = (old.patches or [ ]) ++ [
+    (fetchpatch {
+      url = "file://${duckstation.src}/scripts/shaderc-changes.patch";
+      hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo=";
+      excludes = [
+        "CHANGES"
+        "CMakeLists.txt"
+        "libshaderc/CMakeLists.txt"
+      ];
+    })
+  ];
+})
--- a/nix/steam_deck/configuration/roles/duckstation/package/sources.nix
+++ b/nix/steam_deck/configuration/roles/duckstation/package/sources.nix
@ -0,0 +1,166 @@
+{
+  lib,
+  duckstation,
+  fetchFromGitHub,
+  fetchpatch,
+  shaderc,
+  spirv-cross,
+  discord-rpc,
+  stdenv,
+  cmake,
+  ninja,
+}:
+
+{
+  duckstation =
+    let
+      self = {
+        pname = "duckstation";
+        version = "0.1-7465";
+        src = fetchFromGitHub {
+          owner = "stenzek";
+          repo = "duckstation";
+          rev = "aa955b8ae28314ae061613f0ddf13183a98aca03";
+          #
+          # Some files are filled by using Git commands; it requires deepClone.
+          # More info at `checkout_ref` function in nix-prefetch-git.
+          # However, `.git` is a bit nondeterministic (and Git itself makes no
+          # guarantees whatsoever).
+          # Then, in order to enhance reproducibility, what we will do here is:
+          #
+          # - Execute the desired Git commands;
+          # - Save the obtained info into files;
+          # - Remove `.git` afterwards.
+          #
+          deepClone = true;
+          postFetch = ''
+            cd $out
+            mkdir -p .nixpkgs-auxfiles/
+            git rev-parse HEAD > .nixpkgs-auxfiles/git_hash
+            git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch
+            git describe --dirty | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag
+            git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date
+            find $out -name .git -print0 | xargs -0 rm -fr
+          '';
+          hash = "sha256-ixrlr7Rm6GZAn/kh2sSeCCiK/qdmQ5+5jbbhAKjTx/E=";
+        };
+      };
+    in
+    self;
+
+  shaderc-patched = shaderc.overrideAttrs (
+    old:
+    let
+      version = "2024.3-unstable-2024-08-24";
+      src = fetchFromGitHub {
+        owner = "stenzek";
+        repo = "shaderc";
+        rev = "f60bb80e255144e71776e2ad570d89b78ea2ab4f";
+        hash = "sha256-puZxkrEVhhUT4UcCtEDmtOMX4ugkB6ooMhKRBlb++lE=";
+      };
+    in
+    {
+      pname = "shaderc-patched-for-duckstation";
+      inherit version src;
+      patches = (old.patches or [ ]);
+      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
+        (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true)
+        (lib.cmakeBool "SHADERC_SKIP_TESTS" true)
+      ];
+      outputs = [
+        "out"
+        "lib"
+        "dev"
+      ];
+      postFixup = '''';
+    }
+  );
+  spirv-cross-patched = spirv-cross.overrideAttrs (
+    old:
+    let
+      version = "1.3.290.0";
+      src = fetchFromGitHub {
+        owner = "KhronosGroup";
+        repo = "SPIRV-Cross";
+        rev = "vulkan-sdk-${version}";
+        hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8=";
+      };
+    in
+    {
+      pname = "spirv-cross-patched-for-duckstation";
+      inherit version src;
+      patches = (old.patches or [ ]);
+      cmakeFlags = (old.cmakeFlags or [ ]) ++ [
+        (lib.cmakeBool "SPIRV_CROSS_CLI" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_CPP" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_C_API" true)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_GLSL" true)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_HLSL" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_MSL" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_REFLECT" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_TESTS" false)
+        (lib.cmakeBool "SPIRV_CROSS_ENABLE_UTIL" true)
+        (lib.cmakeBool "SPIRV_CROSS_SHARED" true)
+        (lib.cmakeBool "SPIRV_CROSS_STATIC" false)
+      ];
+    }
+  );
+  discord-rpc-patched = discord-rpc.overrideAttrs (old: {
+    pname = "discord-rpc-patched-for-duckstation";
+    version = "3.4.0-unstable-2024-08-02";
+    src = fetchFromGitHub {
+      owner = "stenzek";
+      repo = "discord-rpc";
+      rev = "144f3a3f1209994d8d9e8a87964a989cb9911c1e";
+      hash = "sha256-VyL8bEjY001eHWcEoUPIAFDAmaAbwcNb1hqlV2a3cWs=";
+    };
+    patches = (old.patches or [ ]);
+  });
+
+  soundtouch-patched = stdenv.mkDerivation (finalAttrs: {
+    pname = "soundtouch-patched-for-duckstation";
+    version = "2.2.3-unstable-2024-08-02";
+    src = fetchFromGitHub {
+      owner = "stenzek";
+      repo = "soundtouch";
+      rev = "463ade388f3a51da078dc9ed062bf28e4ba29da7";
+      hash = "sha256-hvBW/z+fmh/itNsJnlDBtiI1DZmUMO9TpHEztjo2pA0=";
+    };
+
+    nativeBuildInputs = [
+      cmake
+      ninja
+    ];
+
+    meta = {
+      homepage = "https://github.com/stenzek/soundtouch";
+      description = "SoundTouch Audio Processing Library (forked from https://codeberg.org/soundtouch/soundtouch)";
+      license = lib.licenses.lgpl21;
+      platforms = lib.platforms.linux;
+    };
+
+  });
+
+  lunasvg = stdenv.mkDerivation (finalAttrs: {
+    pname = "lunasvg-patched-for-duckstation";
+    version = "2.4.1-unstable-2024-08-24";
+    src = fetchFromGitHub {
+      owner = "stenzek";
+      repo = "lunasvg";
+      rev = "9af1ac7b90658a279b372add52d6f77a4ebb482c";
+      hash = "sha256-ZzOe84ZF5JRrJ9Lev2lwYOccqtEGcf76dyCDBDTvI2o=";
+    };
+
+    nativeBuildInputs = [
+      cmake
+      ninja
+    ];
+
+    meta = {
+      homepage = "https://github.com/stenzek/lunasvg";
+      description = "Standalone SVG rendering library in C++";
+      license = lib.licenses.mit;
+      platforms = lib.platforms.linux;
+    };
+  });
+}
--- a/nix/steam_deck/configuration/roles/shipwright/default.nix
+++ b/nix/steam_deck/configuration/roles/shipwright/default.nix
@ -49,6 +49,7 @@ in
          (
            final: prev:
            let
+              modified_package = (pkgs.callPackage ./package/package.nix { });
              optimizeWithFlags =
                pkg: flags:
                pkg.overrideAttrs (old: {
@ -57,12 +58,12 @@ in
                });
              original_package =
                if config.me.optimizations.enable then
-                  (optimizeWithFlags prev.shipwright [
+                  (optimizeWithFlags modified_package [
                    "-march=znver2"
                    "-mtune=znver2"
                  ])
                else
-                  prev.shipwright;
+                  modified_package;
            in
            {
              shipwright = pkgs.buildEnv {
--- a/nix/steam_deck/configuration/roles/shipwright/package/LICENSE
+++ b/nix/steam_deck/configuration/roles/shipwright/package/LICENSE
@ -0,0 +1,26 @@
+# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
+#
+# They have slight modifications to fix the package build on my home-manager systems.
+#
+# The original license is reproduced below:
+
+Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/nix/steam_deck/configuration/roles/shipwright/package/darwin-fixes.patch
+++ b/nix/steam_deck/configuration/roles/shipwright/package/darwin-fixes.patch
@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2771ee8c..0702adad 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -250,17 +250,13 @@ endif()
+ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ add_custom_target(CreateOSXIcons
+     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+-    COMMAND sips -z 16 16     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
+-    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
+-    COMMAND sips -z 32 32     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
+-    COMMAND sips -z 64 64     ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
+-    COMMAND sips -z 128 128   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
+-    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
+-    COMMAND sips -z 256 256   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
+-    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
+-    COMMAND sips -z 512 512   ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
+-    COMMAND cp                ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
+-    COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png
+    COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png
+    COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+     COMMENT "Creating OSX icons ..."
+     )
+@@ -288,7 +284,6 @@ INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_I
+ 
+ install(CODE "
+     include(BundleUtilities)
+-    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/soh\" \"\" \"${dirs}\")
+     ")
+ 
+ endif()
--- a/nix/steam_deck/configuration/roles/shipwright/package/disable-downloading-stb_image.patch
+++ b/nix/steam_deck/configuration/roles/shipwright/package/disable-downloading-stb_image.patch
@ -0,0 +1,16 @@
+Submodule libultraship contains modified content
+diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake
+index 596158c..c62d7b2 100644
+--- a/libultraship/cmake/dependencies/common.cmake
+++ b/libultraship/cmake/dependencies/common.cmake
+@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep
+ endif()
+ 
+ #=================== STB ===================
+-set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb)
+-file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h")
+-file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"")
+-
+ add_library(stb STATIC)
+ 
+ target_sources(stb PRIVATE
--- a/nix/steam_deck/configuration/roles/shipwright/package/package.nix
+++ b/nix/steam_deck/configuration/roles/shipwright/package/package.nix
@ -0,0 +1,291 @@
+{
+  apple-sdk_13,
+  stdenv,
+  cmake,
+  lsb-release,
+  ninja,
+  lib,
+  fetchFromGitHub,
+  fetchurl,
+  copyDesktopItems,
+  makeDesktopItem,
+  python3,
+  glew,
+  boost,
+  SDL2,
+  SDL2_net,
+  pkg-config,
+  libpulseaudio,
+  libpng,
+  imagemagick,
+  zenity,
+  makeWrapper,
+  darwin,
+  libicns,
+  libzip,
+  nlohmann_json,
+  tinyxml-2,
+  spdlog,
+  writeTextFile,
+  fixDarwinDylibNames,
+  applyPatches,
+}:
+
+let
+
+  # The following would normally get fetched at build time, or a specific version is required
+
+  shipwright_version = "9.0.5";
+  shipwright_src = fetchFromGitHub {
+    owner = "harbourmasters";
+    repo = "shipwright";
+    tag = shipwright_version;
+    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
+    fetchSubmodules = true;
+    deepClone = true;
+    postFetch = ''
+      cd $out
+      git branch --show-current > GIT_BRANCH
+      git rev-parse --short=7 HEAD > GIT_COMMIT_HASH
+      (git describe --tags --abbrev=0 --exact-match HEAD 2>/dev/null || echo "") > GIT_COMMIT_TAG
+      rm -rf .git
+    '';
+  };
+
+  gamecontrollerdb = fetchFromGitHub {
+    owner = "mdqinc";
+    repo = "SDL_GameControllerDB";
+    rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e";
+    hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0=";
+  };
+
+  imgui' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ocornut";
+      repo = "imgui";
+      tag = "v1.91.6-docking";
+      hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A=";
+    };
+    patches = [
+      "${shipwright_src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
+    ];
+  };
+
+  libgfxd = fetchFromGitHub {
+    owner = "glankk";
+    repo = "libgfxd";
+    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
+    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
+  };
+
+  prism = fetchFromGitHub {
+    owner = "KiritoDv";
+    repo = "prism-processor";
+    rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850";
+    hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM=";
+  };
+
+  stb_impl = writeTextFile {
+    name = "stb_impl.c";
+    text = ''
+      #define STB_IMAGE_IMPLEMENTATION
+      #include "stb_image.h"
+    '';
+  };
+
+  stb' = fetchurl {
+    name = "stb_image.h";
+    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
+    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
+  };
+
+  stormlib' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ladislav-zezula";
+      repo = "StormLib";
+      tag = "v9.25";
+      hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
+    };
+    patches = [
+      "${shipwright_src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch"
+    ];
+  };
+
+  thread_pool = fetchFromGitHub {
+    owner = "bshoshany";
+    repo = "thread-pool";
+    tag = "v4.1.0";
+    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
+  };
+
+  metalcpp = fetchFromGitHub {
+    owner = "briaguya-ai";
+    repo = "single-header-metal-cpp";
+    tag = "macOS13_iOS16";
+    hash = "sha256-CSYIpmq478bla2xoPL/cGYKIWAeiORxyFFZr0+ixd7I";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "shipwright";
+  version = shipwright_version;
+  src = shipwright_src;
+
+  patches = [
+    ./darwin-fixes.patch
+    ./disable-downloading-stb_image.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+    imagemagick
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    lsb-release
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libicns
+    darwin.sigtool
+    fixDarwinDylibNames
+  ];
+
+  buildInputs = [
+    boost
+    glew
+    SDL2
+    SDL2_net
+    libpng
+    libzip
+    nlohmann_json
+    tinyxml-2
+    spdlog
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libpulseaudio
+    zenity
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Metal.hpp requires macOS 13.x min.
+    apple-sdk_13
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
+    (lib.cmakeBool "NON_PORTABLE" true)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}")
+  ];
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
+
+  dontAddPrefix = true;
+
+  # Linking fails without this
+  hardeningDisable = [ "format" ];
+
+  preConfigure = ''
+    mkdir stb
+    cp ${stb'} ./stb/${stb'.name}
+    cp ${stb_impl} ./stb/${stb_impl.name}
+    substituteInPlace libultraship/cmake/dependencies/common.cmake \
+      --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"
+  '';
+
+  postPatch = ''
+    substituteInPlace soh/src/boot/build.c.in \
+    --replace-fail "@CMAKE_PROJECT_GIT_BRANCH@" "$(cat GIT_BRANCH)" \
+    --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_HASH@" "$(cat GIT_COMMIT_HASH)" \
+    --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_TAG@" "$(cat GIT_COMMIT_TAG)"
+  '';
+
+  postBuild = ''
+    port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2)
+    cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt
+    mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom
+    pushd ../OTRExporter
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver
+    popd
+  '';
+
+  preInstall = ''
+    # Cmake likes it here for its install paths
+    cp ../OTRExporter/soh.otr soh/soh.otr
+  '';
+
+  postInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out/bin
+      ln -s $out/lib/soh.elf $out/bin/soh
+      install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Recreate the macOS bundle (without using cpack)
+      # We mirror the structure of the bundle distributed by the project
+
+      mkdir -p $out/Applications/soh.app/Contents
+      cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist
+      substituteInPlace $out/Applications/soh.app/Contents/Info.plist \
+        --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}"
+
+      mv $out/MacOS $out/Applications/soh.app/Contents/MacOS
+
+      # "lib" contains all resources that are in "Resources" in the official bundle.
+      # We move them to the right place and symlink them back to $out/lib,
+      # as that's where the game expects them.
+      mv $out/Resources $out/Applications/soh.app/Contents/Resources
+      mv $out/lib/** $out/Applications/soh.app/Contents/Resources
+      rm -rf $out/lib
+      ln -s $out/Applications/soh.app/Contents/Resources $out/lib
+
+      # Copy icons
+      cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns
+
+      # Codesign (ad-hoc)
+      codesign -f -s - $out/Applications/soh.app/Contents/MacOS/soh
+    '';
+
+  fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "soh";
+      icon = "soh";
+      exec = "soh";
+      comment = finalAttrs.meta.description;
+      genericName = "Ship of Harkinian";
+      desktopName = "soh";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://github.com/HarbourMasters/Shipwright";
+    description = "PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
+    mainProgram = "soh";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
+      j0lol
+      matteopacini
+    ];
+    license = with lib.licenses; [
+      # OTRExporter, OTRGui, ZAPDTR, libultraship
+      mit
+      # Ship of Harkinian itself
+      unfree
+    ];
+  };
+})
--- a/nix/steam_deck/configuration/roles/spaghettikart/default.nix
+++ b/nix/steam_deck/configuration/roles/spaghettikart/default.nix
@ -0,0 +1,89 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  steam_spaghettikart = pkgs.writeScriptBin "steam_Spaghettify" ''
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pkgs.libglvnd}/lib"
+    exec ${pkgs.spaghettikart}/bin/Spaghettify "''${@}"
+  '';
+in
+{
+  imports = [ ];
+
+  options.me = {
+    spaghettikart.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install spaghettikart.";
+    };
+  };
+
+  config = lib.mkIf config.me.spaghettikart.enable (
+    lib.mkMerge [
+      {
+        allowedUnfree = [ "spaghettikart" ];
+      }
+      (lib.mkIf config.me.graphical {
+        home.packages = with pkgs; [
+          spaghettikart
+          steam_spaghettikart
+        ];
+
+        home.file.".local/share/spaghettikart/spaghettify.cfg.json" = {
+          source = ./files/spaghettify.cfg.json;
+        };
+
+        home.persistence."/home/deck/.persist" = {
+          files = [
+            ".local/share/spaghettikart/default.sav"
+            ".local/share/spaghettikart/mk64.o2r"
+          ];
+        };
+
+        nixpkgs.overlays = [
+          (
+            final: prev:
+            let
+              modified_package = (pkgs.callPackage ./package/package.nix { });
+              optimizeWithFlags =
+                pkg: flags:
+                pkg.overrideAttrs (old: {
+                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
+                });
+              original_package =
+                if config.me.optimizations.enable then
+                  (optimizeWithFlags modified_package [
+                    "-march=znver2"
+                    "-mtune=znver2"
+                  ])
+                else
+                  modified_package;
+            in
+            {
+              spaghettikart = pkgs.buildEnv {
+                name = prev.spaghettikart.name;
+                paths = [
+                  (config.lib.nixGL.wrap original_package)
+                ];
+                extraOutputsToInstall = [
+                  "man"
+                  "doc"
+                  "info"
+                ];
+                # We have to use 555 instead of the normal 444 here because the .desktop file ends up inside $HOME on steam deck and desktop files must be either not in $HOME or must be executable, otherwise KDE Plasma refuses to execute them.
+                postBuild = ''
+                  chmod 0555 $out/share/applications/spaghettikart.desktop
+                '';
+              };
+            }
+          )
+        ];
+      })
+    ]
+  );
+}
--- a/nix/steam_deck/configuration/roles/spaghettikart/files/spaghettify.cfg.json
+++ b/nix/steam_deck/configuration/roles/spaghettikart/files/spaghettify.cfg.json
@ -0,0 +1,14 @@
+{
+  "CVars": {
+    "gDisableLod": 1,
+    "gMSAAValue": 2,
+    "gShowSpaghettiVersion": 0,
+    "gSkipIntro": 1,
+    "gVsyncEnabled": 1
+  },
+  "Window": {
+    "Fullscreen": {
+      "Enabled": true
+    }
+  }
+}
--- a/nix/steam_deck/configuration/roles/spaghettikart/package/LICENSE
+++ b/nix/steam_deck/configuration/roles/spaghettikart/package/LICENSE
@ -0,0 +1,26 @@
+# The files in this folder are imported from nixpkg https://github.com/NixOS/nixpkgs .
+#
+# They have slight modifications to fix the package build on my home-manager systems.
+#
+# The original license is reproduced below:
+
+Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/nix/steam_deck/configuration/roles/spaghettikart/package/dont-fetch-stb.patch
+++ b/nix/steam_deck/configuration/roles/spaghettikart/package/dont-fetch-stb.patch
@ -0,0 +1,16 @@
+Submodule libultraship contains modified content
+diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake
+index 596158c..c62d7b2 100644
+--- a/libultraship/cmake/dependencies/common.cmake
+++ b/libultraship/cmake/dependencies/common.cmake
+@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep
+ endif()
+ 
+ #=================== STB ===================
+-set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb)
+-file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h")
+-file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"")
+-
+ add_library(stb STATIC)
+ 
+ target_sources(stb PRIVATE
--- a/nix/steam_deck/configuration/roles/spaghettikart/package/git-deps.patch
+++ b/nix/steam_deck/configuration/roles/spaghettikart/package/git-deps.patch
@ -0,0 +1,44 @@
+diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
+index ba3859a..cf3da99 100644
+--- a/torch/CMakeLists.txt
+++ b/torch/CMakeLists.txt
+@@ -36,8 +36,7 @@ if(USE_STANDALONE)
+     # Because libgfxd is not a CMake project, we have to manually fetch it and add it to the build
+     FetchContent_Declare(
+         libgfxd
+-        GIT_REPOSITORY https://github.com/glankk/libgfxd.git
+-        GIT_TAG 96fd3b849f38b3a7c7b7f3ff03c5921d328e6cdf
+        URL @libgfxd_src@
+     )
+ 
+     FetchContent_GetProperties(libgfxd)
+@@ -205,8 +204,7 @@ set(YAML_CPP_BUILD_TESTS OFF)
+ set(YAML_CPP_DISABLE_UNINSTALL ON)
+ FetchContent_Declare(
+     yaml-cpp
+-    GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
+-    GIT_TAG 2f86d13775d119edbb69af52e5f566fd65c6953b
+    URL @yaml-cpp_src@
+ )
+ set(YAML_CPP_BUILD_TESTS OFF)
+ FetchContent_MakeAvailable(yaml-cpp)
+@@ -219,8 +217,7 @@ endif()
+ if(USE_STANDALONE)
+ 	FetchContent_Declare(
+ 		spdlog
+-		GIT_REPOSITORY https://github.com/gabime/spdlog.git
+-		GIT_TAG 7e635fca68d014934b4af8a1cf874f63989352b7
+        URL @spdlog_src@
+ 	)
+ 
+ 	FetchContent_MakeAvailable(spdlog)
+@@ -234,8 +231,7 @@ endif()
+ set(tinyxml2_BUILD_TESTING OFF)
+ FetchContent_Declare(
+     tinyxml2
+-    GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
+-    GIT_TAG 10.0.0
+    URL @tinyxml2_src@
+     OVERRIDE_FIND_PACKAGE
+ )
+ FetchContent_MakeAvailable(tinyxml2)
--- a/nix/steam_deck/configuration/roles/spaghettikart/package/package.nix
+++ b/nix/steam_deck/configuration/roles/spaghettikart/package/package.nix
@ -0,0 +1,264 @@
+{
+  lib,
+  fetchFromGitHub,
+  applyPatches,
+  writeTextFile,
+  fetchurl,
+  stdenv,
+  replaceVars,
+  yaml-cpp,
+  srcOnly,
+  cmake,
+  copyDesktopItems,
+  installShellFiles,
+  lsb-release,
+  makeWrapper,
+  ninja,
+  pkg-config,
+  libGL,
+  libvorbis,
+  libX11,
+  libzip,
+  nlohmann_json,
+  SDL2,
+  SDL2_net,
+  spdlog,
+  tinyxml-2,
+  zenity,
+  sdl_gamecontrollerdb,
+  makeDesktopItem,
+}:
+
+let
+
+  # The following are either normally fetched during build time or a specific version is required
+
+  spaghettikart_src = fetchFromGitHub {
+    owner = "HarbourMasters";
+    repo = "SpaghettiKart";
+    rev = "334fdeafd26c15e03b4f198002ad86b8422c0e2f";
+    hash = "sha256-0nDaX34C7stg7S2mzPChz0fRz/t7yyevKEAPmIR+lak=";
+    fetchSubmodules = true;
+    deepClone = true;
+    postFetch = ''
+      cd $out
+      (git describe --tags HEAD 2>/dev/null || echo "") > PROJECT_VERSION
+      git log --pretty=format:%h -1 > PROJECT_VERSION_PATCH
+      rm -rf .git
+    '';
+  };
+
+  dr_libs = fetchFromGitHub {
+    owner = "mackron";
+    repo = "dr_libs";
+    rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01";
+    hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0=";
+  };
+
+  imgui' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ocornut";
+      repo = "imgui";
+      tag = "v1.91.9b-docking";
+      hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
+    };
+    patches = [
+      "${spaghettikart_src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
+    ];
+  };
+
+  libgfxd = fetchFromGitHub {
+    owner = "glankk";
+    repo = "libgfxd";
+    rev = "008f73dca8ebc9151b205959b17773a19c5bd0da";
+    hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8=";
+  };
+
+  prism = fetchFromGitHub {
+    owner = "KiritoDv";
+    repo = "prism-processor";
+    rev = "7ae724a6fb7df8cbf547445214a1a848aefef747";
+    hash = "sha256-G7koDUxD6PgZWmoJtKTNubDHg6Eoq8I+AxIJR0h3i+A=";
+  };
+
+  stb_impl = writeTextFile {
+    name = "stb_impl.c";
+    text = ''
+      #define STB_IMAGE_IMPLEMENTATION
+      #include "stb_image.h"
+    '';
+  };
+
+  stb' = fetchurl {
+    name = "stb_image.h";
+    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
+    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
+  };
+
+  stormlib' = applyPatches {
+    src = fetchFromGitHub {
+      owner = "ladislav-zezula";
+      repo = "StormLib";
+      tag = "v9.25";
+      hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc=";
+    };
+    patches = [
+      "${spaghettikart_src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch"
+    ];
+  };
+
+  thread_pool = fetchFromGitHub {
+    owner = "bshoshany";
+    repo = "thread-pool";
+    tag = "v4.1.0";
+    hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
+  };
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "spaghettikart";
+  version = "0-unstable-2025-08-07";
+
+  src = spaghettikart_src;
+
+  patches = [
+    # Don't fetch stb as we will patch our own
+    ./dont-fetch-stb.patch
+
+    # Can't fetch these torch deps in the sandbox
+    (replaceVars ./git-deps.patch {
+      libgfxd_src = fetchFromGitHub {
+        owner = "glankk";
+        repo = "libgfxd";
+        rev = "96fd3b849f38b3a7c7b7f3ff03c5921d328e6cdf";
+        hash = "sha256-dedZuV0BxU6goT+rPvrofYqTz9pTA/f6eQcsvpDWdvQ=";
+      };
+      spdlog_src = fetchFromGitHub {
+        owner = "gabime";
+        repo = "spdlog";
+        rev = "7e635fca68d014934b4af8a1cf874f63989352b7";
+        hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
+      };
+      yaml-cpp_src = fetchFromGitHub {
+        owner = "jbeder";
+        repo = "yaml-cpp";
+        rev = "28f93bdec6387d42332220afa9558060c8016795";
+        hash = "sha256-59/s4Rqiiw7LKQw0UwH3vOaT/YsNVcoq3vblK0FiO5c=";
+      };
+      tinyxml2_src = srcOnly tinyxml-2;
+    })
+  ];
+
+  # Recent builds enabled LTO which won't build with nix
+  NIX_CFLAGS_COMPILE = "-fno-lto";
+
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    installShellFiles
+    lsb-release
+    makeWrapper
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    libGL
+    libvorbis
+    libX11
+    libzip
+    nlohmann_json
+    SDL2
+    SDL2_net
+    spdlog
+    tinyxml-2
+    zenity
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+  ];
+
+  strictDeps = true;
+
+  # Linking fails without this
+  hardeningDisable = [ "format" ];
+
+  preConfigure = ''
+    mkdir stb
+    cp ${stb'} ./stb/${stb'.name}
+    cp ${stb_impl} ./stb/${stb_impl.name}
+    substituteInPlace libultraship/cmake/dependencies/common.cmake \
+      --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"
+  '';
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+    --replace-fail "COMMAND git describe --tags" "COMMAND echo $(cat PROJECT_VERSION)" \
+    --replace-fail "COMMAND git log --pretty=format:%h -1" "COMMAND echo $(cat PROJECT_VERSION_PATCH)"
+  '';
+
+  postBuild = ''
+    cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt
+    ./TorchExternal/src/TorchExternal-build/torch pack ../assets spaghetti.o2r o2r
+  '';
+
+  postInstall = ''
+    installBin Spaghettify
+    mkdir -p $out/share/spaghettikart
+    cp -r ../yamls $out/share/spaghettikart/
+    install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt}
+    install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png
+    install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE
+    install -Dm644 -t $out/share/licenses/spaghettikart/libultraship ../libultraship/LICENSE
+    install -Dm644 -t $out/share/licenses/spaghettikart/thread_pool ${thread_pool}/LICENSE.txt
+  '';
+
+  # Unfortunately, spaghettikart really wants a writable working directory
+  # Create $HOME/.local/share/spaghettikart and symlink required files
+
+  postFixup = ''
+    wrapProgram $out/bin/Spaghettify \
+      --prefix PATH ":" ${lib.makeBinPath [ zenity ]} \
+      --run 'mkdir -p ~/.local/share/spaghettikart' \
+      --run "ln -sf $out/share/spaghettikart/spaghetti.o2r ~/.local/share/spaghettikart/spaghetti.o2r" \
+      --run "ln -sf $out/share/spaghettikart/config.yml ~/.local/share/spaghettikart/config.yml" \
+      --run "ln -sfT $out/share/spaghettikart/yamls ~/.local/share/spaghettikart/yamls" \
+      --run "ln -sf $out/share/spaghettikart/gamecontrollerdb.txt ~/.local/share/spaghettikart/gamecontrollerdb.txt" \
+      --run 'cd ~/.local/share/spaghettikart'
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "spaghettikart";
+      icon = "spaghettikart";
+      exec = "Spaghettify";
+      comment = finalAttrs.meta.description;
+      genericName = "spaghettikart";
+      desktopName = "spaghettikart";
+      categories = [ "Game" ];
+    })
+  ];
+
+  meta = {
+    homepage = "https://github.com/HarbourMasters/SpaghettiKart";
+    description = "Mario Kart 64 PC Port";
+    mainProgram = "Spaghettify";
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ qubitnano ];
+    license = with lib.licenses; [
+      # libultraship, libgfxd, thread_pool, dr_libs, prism-processor
+      mit
+      # Reverse engineering
+      unfree
+    ];
+  };
+})
Author	SHA1	Message	Date
Tom Alexander	f036ec4b96	Add back duckstation.	2025-09-13 12:28:29 -04:00
Tom Alexander	74ee87a111	Switch to bundled packages to fix build.	2025-09-13 12:00:09 -04:00
Tom Alexander	d0f23c0cb1	Add Spaghetti Kart to the Steam Deck.	2025-09-13 11:28:29 -04:00
Tom Alexander	c72141e070	Install SpaghettiKart.	2025-09-12 19:02:22 -04:00