From c457f6414bf860e919571fd50776f3492b9175e8 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 25 Apr 2025 20:13:25 -0400 Subject: [PATCH] Fix sm64ex. --- nix/configuration/flake.lock | 10 ++++------ nix/configuration/hosts/quark/optimized_build.nix | 8 ++++---- nix/configuration/roles/sm64ex/default.nix | 8 ++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index f031913..4baf8e3 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -8,15 +8,14 @@ ] }, "locked": { - "lastModified": 1, - "narHash": "sha256-c4Ds4E/10Zj5AQLuJ3JvJTuDK8o2WjVXLcIL7eyhTfw=", "path": "flakes/ansible-sshjail", "type": "path" }, "original": { "path": "flakes/ansible-sshjail", "type": "path" - } + }, + "parent": [] }, "crane": { "locked": { @@ -372,15 +371,14 @@ ] }, "locked": { - "lastModified": 1, - "narHash": "sha256-5DWw7GnwVZ98HUp/UUJcyUmmy9Bh/mcQB8MQQ0t3ZRo=", "path": "flakes/zsh-histdb", "type": "path" }, "original": { "path": "flakes/zsh-histdb", "type": "path" - } + }, + "parent": [] } }, "root": "root", diff --git a/nix/configuration/hosts/quark/optimized_build.nix b/nix/configuration/hosts/quark/optimized_build.nix index 78b081d..ea654ff 100644 --- a/nix/configuration/hosts/quark/optimized_build.nix +++ b/nix/configuration/hosts/quark/optimized_build.nix @@ -28,10 +28,10 @@ # system.includeBuildDependencies = true; # This also should enable building offline? TODO: test. - # nix.extraOptions = '' - # keep-outputs = true - # keep-derivations = true - # ''; + nix.extraOptions = '' + keep-outputs = true + keep-derivations = true + ''; nixpkgs.hostPlatform = { gcc.arch = "znver5"; diff --git a/nix/configuration/roles/sm64ex/default.nix b/nix/configuration/roles/sm64ex/default.nix index d8ea66d..a6be1bb 100644 --- a/nix/configuration/roles/sm64ex/default.nix +++ b/nix/configuration/roles/sm64ex/default.nix @@ -34,6 +34,14 @@ # }) # ]; + nixpkgs.overlays = [ + (final: prev: { + sm64ex = prev.sm64ex.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ final.libGL ]; + }); + }) + ]; + # TODO perhaps install ~/.local/share/sm64ex/sm64config.txt environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {