diff --git a/with-asar/Makefile b/with-asar/Makefile index 13d4fa7..804c832 100644 --- a/with-asar/Makefile +++ b/with-asar/Makefile @@ -2,21 +2,17 @@ # for easier manipulation of the build process, so # it's worth adding in. -# The name of the resulting ROM file. This will be -# overwritten by Nix when 'nix build' is called. -NAME ?= main - ASM=asar ASMFLAGS= VPATH=src .PHONY: all -all: $(NAME).sfc +all: main.sfc -$(NAME).sfc: main.asm +main.sfc: main.asm $(ASM) $(ASMFLAGS) $^ $@ # Clean directory .PHONY: clean clean: - rm $(NAME).sfc + rm main.sfc diff --git a/with-asar/flake.nix b/with-asar/flake.nix index 9ef34cc..773e8b9 100644 --- a/with-asar/flake.nix +++ b/with-asar/flake.nix @@ -34,7 +34,7 @@ outputs = { self, nativeBuildInputs = [ cmake ]; configurePhase = "cmake src"; installPhase = '' - install -Dm555 asar/asar-standalone $out/bin/asar + install -Dm755 asar/asar-standalone $out/bin/asar ''; }; mesen-s = stdenv.mkDerivation { @@ -56,9 +56,9 @@ outputs = { self, mono $out/opt/mesen-s/mesen-s "\$@" END - install -Dm555 mesen-s $out/bin/mesen-s - install -Dm555 bin/x64/Release/Mesen-S.exe $out/opt/mesen-s/mesen-s - install -Dm444 InteropDLL/obj.x64/libMesenSCore.x64.dll $out/lib/libMesenSCore.dll + install -Dm755 mesen-s $out/bin/mesen-s + install -Dm755 bin/x64/Release/Mesen-S.exe $out/opt/mesen-s/mesen-s + install -Dm644 InteropDLL/obj.x64/libMesenSCore.x64.dll $out/lib/libMesenSCore.dll ''; preFixup = '' @@ -76,13 +76,9 @@ outputs = { self, packages.default = stdenv.mkDerivation { inherit pname version; - src = self; - nativeBuildInputs = [ asar ]; - - makeFlags = [ "NAME=${pname}" ]; - installPhase = "install -m444 ${pname}.sfc $out"; + installPhase = "install -m644 main.sfc $out"; }; }); }