Skip to content

Commit bd7a896

Browse files
authored
Use flake.nix instead of flake.nix (#1244)
1 parent fa26a11 commit bd7a896

17 files changed

+1338
-146
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pipeline {
1717
sh 'curl -L "https://github.com/decompals/mips-binutils-2.6/releases/download/main/binutils-2.6-linux.tar.gz" | tar zx -C tools/build/cc/gcc2.7.2'
1818
sh 'curl -L "https://github.com/decompals/mips-binutils-egcs-2.9.5/releases/latest/download/mips-binutils-egcs-2.9.5-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
1919
sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
20-
sh 'pip install -U -r requirements.txt --break-system-packages'
20+
sh 'pip install -U -r tools/configure/requirements.txt --break-system-packages'
2121
sh 'cargo install pigment64'
2222
sh 'cargo install crunch64-cli'
2323
sh './configure'

SETUP.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,15 @@ If you have Visual Studio Code, you can type `code .` to open the repo within it
6363
## Nix
6464
6565
1. Install [Nix](https://nixos.org/download.html)
66+
1. [Enable nix-command and flakes experimental features](https://nix.dev/manual/nix/2.25/command-ref/conf-file#conf-experimental-features)
6667
2. Clone the repository and `cd` into it
67-
3. Enter a shell with `NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 NIX_BUILD_CORES=0 nix-shell`
68-
4. Continue with [building](#building)
68+
3. Add **all** baseroms to the store:
69+
* `nix store add --mode flat --name papermario.us.z64 --hash-algo sha1 path/to/papermario.us.z64`
70+
* `nix store add --mode flat --name papermario.jp.z64 --hash-algo sha1 path/to/papermario.jp.z64`
71+
* `nix store add --mode flat --name papermario.pal.z64 --hash-algo sha1 path/to/papermario.pal.z64`
72+
* `nix store add --mode flat --name papermario.ique.z64 --hash-algo sha1 path/to/papermario.ique.z64`
73+
4. Enter a shell with `nix develop`
74+
5. Continue with [building](#building) (ignore baserom instructions)
6975
7076
# Building
7177

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
python3 tools/build/configure.py "$@"
2+
python3 tools/configure/src/configure/main.py "$@"

flake.lock

Lines changed: 183 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)