colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

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

28
pkgs/applications/emulators/uxn/default.nix
View File

@ -4,15 +4,15 @@
, SDL2 , SDL2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "uxn"; pname = "uxn";
version = "0.pre+unstable=2021-08-30"; version = "unstable-2022-10-22";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~rabbits"; owner = "~rabbits";
repo = pname; repo = "uxn";
rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce"; rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d";
hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M="; hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ=";
}; };
buildInputs = [ buildInputs = [
@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
dontConfigure = true; 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 = '' buildPhase = ''
runHook preBuild runHook preBuild
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm ./build.sh --no-run
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
runHook postBuild runHook postBuild
''; '';
@ -36,10 +36,10 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -d $out/bin/ $out/share/${pname}/ install -d $out/bin/ $out/share/uxn/
cp uxnasm uxncli uxnemu $out/bin/ cp bin/uxnasm bin/uxncli bin/uxnemu $out/bin/
cp -r projects $out/share/${pname}/ cp -r projects $out/share/uxn/
runHook postInstall runHook postInstall
''; '';
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.xxiivv.com/site/uxn.html"; homepage = "https://wiki.xxiivv.com/site/uxn.html";
description = "An assembler and emulator for the Uxn stack machine"; description = "An assembler and emulator for the Uxn stack machine";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres kototama ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };
} }