Merge pull request #1999 from leo60228/nixos-install

Fix build on NixOS and add instructions to INSTALL.md
This commit is contained in:
Martin Griffin
2024-06-20 19:10:57 +01:00
committed by GitHub
3 changed files with 9 additions and 2 deletions
+7
View File
@@ -354,6 +354,13 @@ Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to
> [install devkitARM on Arch Linux](#installing-devkitarm-on-arch-linux). > [install devkitARM on Arch Linux](#installing-devkitarm-on-arch-linux).
</details> </details>
### NixOS
Run the following command to start an interactive shell with the necessary packages:
```bash
nix-shell -p pkgsCross.arm-embedded.stdenv.cc git pkg-config libpng
```
Then proceed to [Choosing where to store pokeemerald Expansion (Linux)](#choosing-where-to-store-pokeemerald-expansion-linux).
### Other distributions ### Other distributions
_(Specific instructions for other distributions would be greatly appreciated!)_ _(Specific instructions for other distributions would be greatly appreciated!)_
+1 -1
View File
@@ -73,7 +73,7 @@ MODERN_ELF_NAME := $(MODERN_ROM_NAME:.gba=.elf)
MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map) MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map)
MODERN_OBJ_DIR_NAME := build/modern MODERN_OBJ_DIR_NAME := build/modern
SHELL := /bin/bash -o pipefail SHELL := bash -o pipefail
ELF = $(ROM:.gba=.elf) ELF = $(ROM:.gba=.elf)
MAP = $(ROM:.gba=.map) MAP = $(ROM:.gba=.map)
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
if [[ -d "$DEVKITARM/bin/" ]]; then if [[ -d "$DEVKITARM/bin/" ]]; then
OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump" OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"