Remove unnecessary name-selection

This commit is contained in:
Kiana Sheibani 2022-05-01 12:16:53 -04:00
parent a444d0a429
commit 9911cac59a
Signed by: toki
GPG key ID: 6CB106C25E86A9F7
2 changed files with 8 additions and 16 deletions

View file

@ -2,21 +2,17 @@
# for easier manipulation of the build process, so # for easier manipulation of the build process, so
# it's worth adding in. # 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 ASM=asar
ASMFLAGS= ASMFLAGS=
VPATH=src VPATH=src
.PHONY: all .PHONY: all
all: $(NAME).sfc all: main.sfc
$(NAME).sfc: main.asm main.sfc: main.asm
$(ASM) $(ASMFLAGS) $^ $@ $(ASM) $(ASMFLAGS) $^ $@
# Clean directory # Clean directory
.PHONY: clean .PHONY: clean
clean: clean:
rm $(NAME).sfc rm main.sfc

View file

@ -34,7 +34,7 @@ outputs = { self,
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
configurePhase = "cmake src"; configurePhase = "cmake src";
installPhase = '' installPhase = ''
install -Dm555 asar/asar-standalone $out/bin/asar install -Dm755 asar/asar-standalone $out/bin/asar
''; '';
}; };
mesen-s = stdenv.mkDerivation { mesen-s = stdenv.mkDerivation {
@ -56,9 +56,9 @@ outputs = { self,
mono $out/opt/mesen-s/mesen-s "\$@" mono $out/opt/mesen-s/mesen-s "\$@"
END END
install -Dm555 mesen-s $out/bin/mesen-s install -Dm755 mesen-s $out/bin/mesen-s
install -Dm555 bin/x64/Release/Mesen-S.exe $out/opt/mesen-s/mesen-s install -Dm755 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 -Dm644 InteropDLL/obj.x64/libMesenSCore.x64.dll $out/lib/libMesenSCore.dll
''; '';
preFixup = '' preFixup = ''
@ -76,13 +76,9 @@ outputs = { self,
packages.default = stdenv.mkDerivation { packages.default = stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = self; src = self;
nativeBuildInputs = [ asar ]; nativeBuildInputs = [ asar ];
installPhase = "install -m644 main.sfc $out";
makeFlags = [ "NAME=${pname}" ];
installPhase = "install -m444 ${pname}.sfc $out";
}; };
}); });
} }