From e508aab454b96e188ab9c999f09eba3b6871dd78 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Thu, 6 Mar 2025 15:38:36 -0500 Subject: [PATCH] =?UTF-8?q?descent3-unwrapped:=201.5.0-beta-unstable-2025-?= =?UTF-8?q?02-13=20=E2=86=92=201.5.0-beta-unstable-2025-03-06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/de/descent3-unwrapped/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix index 766f28fe4bae..36cade041c32 100644 --- a/pkgs/by-name/de/descent3-unwrapped/package.nix +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -1,10 +1,13 @@ { - SDL2, cmake, fetchFromGitHub, glm, + httplib, lib, + openssl, + plog, runCommand, + sdl3, stdenv, unstableGitUpdater, writeShellScript, @@ -17,12 +20,11 @@ stdenv.mkDerivation rec { # the wrapped version of Descent 3. Once there’s a stable version of Descent # 3 that supports the -additionaldir command-line option, we can stop using # an unstable version of Descent 3. - version = "1.5.0-beta-unstable-2025-02-13"; + version = "1.5.0-beta-unstable-2025-03-06"; src = fetchFromGitHub { owner = "DescentDevelopers"; repo = "Descent3"; - rev = "10a20d7cb769a08010e7887b4701a0ecfb142492"; - fetchSubmodules = true; + rev = "c99e57cfabb16b2b428d4827eedb26b8cc20a1ee"; leaveDotGit = true; # Descent 3 is supposed to display its Git commit hash in the bottom right # corner of the main menu. That feature only works if either the .git @@ -48,14 +50,17 @@ stdenv.mkDerivation rec { git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt rm -r .git ''; - hash = "sha256-Ufu6oHLUn0eI6OTp8cfHRLYpx+tZ3QwX4qz3KpTbQ68="; + hash = "sha256-HbEAv4HFZromeVfsH66m9PwinOG9qs5rQLGK5hkO3+A="; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ - SDL2 glm + httplib + openssl + plog + sdl3 zlib ]; cmakeFlags = [ "-DFORCE_PORTABLE_INSTALL=OFF" ];