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

uxn: 0.pre+unstable=2021-08-30 -> unstable-2022-10-22

authored by Anderson Torres and committed by GitHub ac44ef87 255b2ae3

+20 -14
+6
maintainers/maintainer-list.nix
··· 7381 7381 githubId = 2037002; 7382 7382 name = "Konstantinos"; 7383 7383 }; 7384 + kototama = { 7385 + email = "kototama@posteo.jp"; 7386 + github = "kototama"; 7387 + githubId = 128620; 7388 + name = "Kototama"; 7389 + }; 7384 7390 kouyk = { 7385 7391 email = "skykinetic@stevenkou.xyz"; 7386 7392 github = "kouyk";
+14 -14
pkgs/applications/emulators/uxn/default.nix
··· 4 4 , SDL2 5 5 }: 6 6 7 - stdenv.mkDerivation rec { 7 + stdenv.mkDerivation { 8 8 pname = "uxn"; 9 - version = "0.pre+unstable=2021-08-30"; 9 + version = "unstable-2022-10-22"; 10 10 11 11 src = fetchFromSourcehut { 12 12 owner = "~rabbits"; 13 - repo = pname; 14 - rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce"; 15 - hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M="; 13 + repo = "uxn"; 14 + rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d"; 15 + hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ="; 16 16 }; 17 17 18 18 buildInputs = [ ··· 21 21 22 22 dontConfigure = true; 23 23 24 - # It is easier to emulate build.sh script 24 + postPatch = '' 25 + sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh 26 + ''; 27 + 25 28 buildPhase = '' 26 29 runHook preBuild 27 30 28 - cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm 29 - cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/uxncli.c -o uxncli 30 - cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/devices/ppu.c \ 31 - src/devices/apu.c src/uxnemu.c $(sdl2-config --cflags --libs) -o uxnemu 31 + ./build.sh --no-run 32 32 33 33 runHook postBuild 34 34 ''; ··· 36 36 installPhase = '' 37 37 runHook preInstall 38 38 39 - install -d $out/bin/ $out/share/${pname}/ 39 + install -d $out/bin/ $out/share/uxn/ 40 40 41 - cp uxnasm uxncli uxnemu $out/bin/ 42 - cp -r projects $out/share/${pname}/ 41 + cp bin/uxnasm bin/uxncli bin/uxnemu $out/bin/ 42 + cp -r projects $out/share/uxn/ 43 43 44 44 runHook postInstall 45 45 ''; ··· 48 48 homepage = "https://wiki.xxiivv.com/site/uxn.html"; 49 49 description = "An assembler and emulator for the Uxn stack machine"; 50 50 license = with licenses; [ mit ]; 51 - maintainers = with maintainers; [ AndersonTorres ]; 51 + maintainers = with maintainers; [ AndersonTorres kototama ]; 52 52 platforms = with platforms; unix; 53 53 }; 54 54 }