From 8bfb8877e3ea7ad1d405eac0470dc4de9b875ef0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 23 Sep 2025 23:06:49 +0200 Subject: [PATCH] etlegacy-unwrapped: cleanup, remove obsolete things, restore `fakeGit` --- .../by-name/et/etlegacy-unwrapped/package.nix | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index bbe6bf7e13fb..86e0ad202eb4 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -1,13 +1,10 @@ { lib, stdenv, - writeShellApplication, + writeScriptBin, fetchFromGitHub, cjson, cmake, - git, - makeBinaryWrapper, - unzip, curl, freetype, glew, @@ -25,15 +22,11 @@ }: let version = "2.83.2"; - fakeGit = writeShellApplication { - name = "git"; - - text = '' - if [ "$1" = "describe" ]; then - echo "${version}" - fi - ''; - }; + fakeGit = writeScriptBin "git" '' + if [ "$1" = "describe" ]; then + echo "${version}" + fi + ''; in stdenv.mkDerivation { pname = "etlegacy-unwrapped"; @@ -51,9 +44,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake fakeGit - git - makeBinaryWrapper - unzip ]; buildInputs = [ @@ -102,8 +92,6 @@ stdenv.mkDerivation { (lib.cmakeFeature "INSTALL_DEFAULT_BINDIR" "${placeholder "out"}/bin") ]; - hardeningDisable = [ "fortify" ]; - meta = { description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; homepage = "https://etlegacy.com";