requireFile-less coopdx

This commit is contained in:
Shelvacu
2024-09-24 16:07:18 -07:00
parent e3b49965b9
commit c367662b51
3 changed files with 21 additions and 8 deletions

View File

@@ -12,12 +12,7 @@
lib,
bash,
python3,
requireFile,
baseRom ? requireFile {
name = "baserom.us.z64";
message = "bla";
sha256 = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91";
},
sm64baserom,
enableTextureFix ? true,
enableDiscord ? false,
@@ -75,7 +70,7 @@ stdenv.mkDerivation {
];
preBuild = ''
ln -s ${baseRom} baserom.us.z64
ln -s ${sm64baserom} baserom.us.z64
substituteInPlace Makefile \
--replace-fail ' -march=$(TARGET_ARCH) ' ' '
# workaround a bug in the build
@@ -93,7 +88,7 @@ stdenv.mkDerivation {
mkdir -p $share
cp $built/${pname} $share/${pname}-unwrapped
cp -r $built/{dynos,lang,mods,palettes} $share
ln -s ${baseRom} $share/baserom.us.z64
ln -s ${sm64baserom} $share/baserom.us.z64
${lib.optionalString enableDiscord ''
cp $built/libdiscord_game_sdk* $share

16
flake.lock generated
View File

@@ -1289,6 +1289,7 @@
"nixvim": "nixvim",
"nixvim-unstable": "nixvim-unstable",
"padtype-unstable": "padtype-unstable",
"sm64baserom": "sm64baserom",
"sops-nix": "sops-nix",
"vscode-server": "vscode-server",
"vscode-server-unstable": "vscode-server-unstable"
@@ -1406,6 +1407,21 @@
"type": "github"
}
},
"sm64baserom": {
"locked": {
"lastModified": 1727217362,
"narHash": "sha256-Ws5dVa/7kFnesEkZsRPJmqnYKNlBYm7fx49KgT73bS8=",
"ref": "refs/heads/master",
"rev": "aeb2d33ee623ede8c88f0f492c80f437889adfe1",
"revCount": 1,
"type": "git",
"url": "https://git.uninsane.org/shelvacu/sm64baserom.git"
},
"original": {
"type": "git",
"url": "https://git.uninsane.org/shelvacu/sm64baserom.git"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [

View File

@@ -85,6 +85,7 @@
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
sm64baserom.url = "git+https://git.uninsane.org/shelvacu/sm64baserom.git";
};
outputs =
@@ -308,6 +309,7 @@
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [ inputs.sm64baserom.overlays.default ];
};
in
{