From 3dd0faac5107c6f5493b034ed48499f0815007e7 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 27 Jun 2025 00:12:50 +0200 Subject: [PATCH 1/2] dsda-doom: 0.29.0 -> 0.29.2 --- pkgs/by-name/ds/dsda-doom/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index dde6e731f5c5..b9b11f7a9a40 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -8,7 +8,7 @@ SDL2_image, fluidsynth, portmidi, - dumb, + libopenmpt, libvorbis, libmad, libGLU, @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; - rev = "v${version}"; - hash = "sha256-mcg3GAQ90Qg7d1+/ci/XlTTF2q0tB6j+pp+Fb1Mpcao="; + tag = "v${version}"; + hash = "sha256-KNF91ikLFJPjSSsoz01kwAG5aCoABFyIQ5ZzbshFlkI="; }; sourceRoot = "${src.name}/prboom2"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - dumb + libopenmpt fluidsynth libGLU libmad From 084a12f3f3a88e8aab8a9172cfd9c52e787fd57c Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 27 Jun 2025 00:13:46 +0200 Subject: [PATCH 2/2] dsda-doom: use finalAttrs --- pkgs/by-name/ds/dsda-doom/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index b9b11f7a9a40..610f91675be6 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -17,18 +17,18 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsda-doom"; version = "0.29.2"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KNF91ikLFJPjSSsoz01kwAG5aCoABFyIQ5ZzbshFlkI="; }; - sourceRoot = "${src.name}/prboom2"; + sourceRoot = "${finalAttrs.src.name}/prboom2"; nativeBuildInputs = [ cmake ]; @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/kraflab/dsda-doom"; - changelog = "https://github.com/kraflab/dsda-doom/releases/tag/v${version}"; + changelog = "https://github.com/kraflab/dsda-doom/releases/tag/v${finalAttrs.version}"; description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+"; mainProgram = "dsda-doom"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ Gliczy ]; }; -} +})