From c8de15eb07efc1d79cbf940ed69d70d9a269d9ba Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:44:30 +0100 Subject: [PATCH 1/2] maintainers: add Gliczy --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 31948d66d50b..5649a04f5690 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6745,6 +6745,11 @@ githubId = 615606; name = "Glenn Searby"; }; + Gliczy = { + name = "Gliczy"; + github = "Gliczy"; + githubId = 129636582; + }; glittershark = { name = "Griffin Smith"; email = "root@gws.fyi"; From a2d1e1de38f0cd08f02060b82f5f068d6ca4f3c2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:45:19 +0100 Subject: [PATCH 2/2] dsda-doom: init at 0.27.5 --- pkgs/by-name/ds/dsda-doom/package.nix | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/ds/dsda-doom/package.nix diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix new file mode 100644 index 000000000000..cedf7c0524f5 --- /dev/null +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, SDL2 +, SDL2_mixer +, SDL2_image +, fluidsynth +, soundfont-fluid +, portmidi +, dumb +, libvorbis +, libmad +, libGLU +, libzip +}: + +stdenv.mkDerivation rec { + pname = "dsda-doom"; + version = "0.27.5"; + + src = fetchFromGitHub { + owner = "kraflab"; + repo = "dsda-doom"; + rev = "v${version}"; + hash = "sha256-+rvRj6RbJ/RaKmlDZdB2oBm/U6SuHNxye8TdpEOZwQw="; + }; + + sourceRoot = "${src.name}/prboom2"; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + SDL2_image + fluidsynth + portmidi + dumb + libvorbis + libmad + libGLU + libzip + ]; + + # Fixes impure path to soundfont + prePatch = '' + substituteInPlace src/m_misc.c --replace \ + "/usr/share/sounds/sf3/default-GM.sf3" \ + "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" + ''; + + meta = with lib; { + homepage = "https://github.com/kraflab/dsda-doom"; + description = "An advanced Doom source port with a focus on speedrunning, successor of PrBoom+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.Gliczy ]; + }; +}