From 6f34b252aa8814e04155bae343da0c89111e9270 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Sun, 31 Mar 2024 23:13:29 +0200 Subject: [PATCH 1/2] maintainers: add soyouzpanda --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 029958cbf81f..fe20aa3d9234 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18538,6 +18538,12 @@ githubId = 20756843; name = "Sofi"; }; + soyouzpanda = { + name = "soyouzpanda"; + email = "soyouzpanda@soyouzpanda.fr"; + github = "soyouzpanda"; + githubId = 23421201; + }; soywod = { name = "Clément DOUIN"; email = "clement.douin@posteo.net"; From db521d5f481991a5b5ba2cb9ca0afc14b0a1b612 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Sun, 31 Mar 2024 23:13:44 +0200 Subject: [PATCH 2/2] pvsneslib: init at 4.2.0 --- pkgs/by-name/pv/pvsneslib/package.nix | 73 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/pv/pvsneslib/package.nix diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix new file mode 100644 index 000000000000..80f8e333d370 --- /dev/null +++ b/pkgs/by-name/pv/pvsneslib/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gcc +}: + +stdenv.mkDerivation rec { + pname = "pvsneslib"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "alekmaul"; + repo = "pvsneslib"; + rev = version; + hash = "sha256-Cl4+WvjKbq5IPqf7ivVYwBYwDDWWHGNeq4nWXPxsUHw="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ gcc cmake ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace tools/816-opt/Makefile \ + --replace-fail 'LDFLAGS := -lpthread' 'LDFLAGS :=' \ + --replace-fail 'LDFLAGS := -pthread' 'LDFLAGS += -pthread' \ + --replace-fail 'LDFLAGS += -lpthread -static' '# LDFLAGS += -lpthread -static' + + substituteInPlace tools/bin2txt/Makefile \ + tools/gfx2snes/Makefile \ + tools/gfx4snes/Makefile \ + tools/snestools/Makefile \ + tools/816-opt/Makefile \ + tools/tmx2snes/Makefile \ + --replace-fail '$(CFLAGS) $(OBJS)' '$(LDFLAGS) $(OBJS)' + + substituteInPlace tools/smconv/Makefile \ + --replace-fail '$(CFLAGS) $(LDFLAGS)' '$(LDFLAGS)' + + substituteInPlace tools/constify/Makefile \ + --replace-fail '$(CFLAGS) $(DEFINES) $(OBJS)' '$(LDFLAGS) $(DEFINES) $(OBJS)' + + substituteInPlace tools/snestools/Makefile \ + --replace-fail '-Wno-format' ' ' + + substituteInPlace tools/snesbrr/brr/Makefile \ + --replace-fail 'LDFLAGS ' 'LDFLAGS := + LDFLAGS ' + + substituteInPlace compiler/wla-dx/wlalink/write.c \ + --replace-fail 'sort_anonymous_labels()' 'sort_anonymous_labels(void)' + ''; + + preBuild = '' + export PVSNESLIB_HOME=$(pwd) + ''; + + installPhase = '' + runHook preInstall + cp -r . $out + runHook postInstall + ''; + + meta = { + description = "Free and open source development kit for the Nintendo SNES"; + homepage = "https://github.com/alekmaul/pvsneslib"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ soyouzpanda ]; + mainProgram = "pvsneslib"; + platforms = lib.platforms.all; + }; +}