From 00d247dcfc683f0b10db0de8ee009ff6998d8b5e Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 18 Oct 2025 01:24:53 -0400 Subject: [PATCH 1/2] vangers: fix build for cmake 4 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/va/vangers/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index 0143ae4261b9..eb17bb7618c9 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { hash = "sha256-IhCQh60wBzaRsj72Y8NUHrv9lvss0fmgHjzrO/subOI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)" + ''; + buildInputs = [ SDL2 SDL2_net From 9b4585dea5e5d96fb818bb3f3caec24033e9c0db Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 18 Oct 2025 01:27:55 -0400 Subject: [PATCH 2/2] vangers: modernize Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/va/vangers/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index eb17bb7618c9..b4a06d427bca 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -4,6 +4,7 @@ callPackage, stdenv, cmake, + installShellFiles, SDL2, SDL2_net, libogg, @@ -32,6 +33,8 @@ stdenv.mkDerivation { "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)" ''; + strictDeps = true; + buildInputs = [ SDL2 SDL2_net @@ -41,13 +44,20 @@ stdenv.mkDerivation { clunk zlib ]; - nativeBuildInputs = [ cmake ]; + + nativeBuildInputs = [ + cmake + installShellFiles + ]; installPhase = '' - mkdir -p $out/bin - install -T -m755 server/vangers_server $out/bin/vangers_server - install -T -m755 src/vangers $out/bin/vangers - install -T -m755 surmap/surmap $out/bin/surmap + runHook preInstall + + installBin server/vangers_server + installBin src/vangers + installBin surmap/surmap + + runHook postInstall ''; meta = {