Merge pull request #197698 from kototama/update-uxn-version

uxn: 0.pre+unstable=2021-08-30 -> unstable-2022-10-22
This commit is contained in:
Anderson Torres 2022-10-29 15:39:21 -03:00 committed by GitHub
commit ac44ef87ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions

View file

@ -7381,6 +7381,12 @@
githubId = 2037002;
name = "Konstantinos";
};
kototama = {
email = "kototama@posteo.jp";
github = "kototama";
githubId = 128620;
name = "Kototama";
};
kouyk = {
email = "skykinetic@stevenkou.xyz";
github = "kouyk";

View file

@ -4,15 +4,15 @@
, SDL2
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "uxn";
version = "0.pre+unstable=2021-08-30";
version = "unstable-2022-10-22";
src = fetchFromSourcehut {
owner = "~rabbits";
repo = pname;
rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce";
hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M=";
repo = "uxn";
rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d";
hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ=";
};
buildInputs = [
@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
dontConfigure = true;
# It is easier to emulate build.sh script
postPatch = ''
sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh
'';
buildPhase = ''
runHook preBuild
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/uxncli.c -o uxncli
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/devices/ppu.c \
src/devices/apu.c src/uxnemu.c $(sdl2-config --cflags --libs) -o uxnemu
./build.sh --no-run
runHook postBuild
'';
@ -36,10 +36,10 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -d $out/bin/ $out/share/${pname}/
install -d $out/bin/ $out/share/uxn/
cp uxnasm uxncli uxnemu $out/bin/
cp -r projects $out/share/${pname}/
cp bin/uxnasm bin/uxncli bin/uxnemu $out/bin/
cp -r projects $out/share/uxn/
runHook postInstall
'';
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.xxiivv.com/site/uxn.html";
description = "An assembler and emulator for the Uxn stack machine";
license = with licenses; [ mit ];
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres kototama ];
platforms = with platforms; unix;
};
}