From 96aa751629d689329cde627e92a15d452e239d75 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 2 Dec 2024 10:56:26 +0100 Subject: [PATCH 1/3] etlegacy-unwrapped: fix Darwin build --- pkgs/by-name/et/etlegacy-unwrapped/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index a3c7280b9cbe..a080a17226f0 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -2,6 +2,7 @@ , stdenv , writeShellApplication , fetchFromGitHub +, fetchpatch , cjson , cmake , git @@ -44,6 +45,16 @@ stdenv.mkDerivation { hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA="; }; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + # Fix compilation on Darwin archs + # Reported upstream at https://github.com/etlegacy/etlegacy/pull/3005 + # Remove this patch when the PR is merged + (fetchpatch { + url = "https://github.com/etlegacy/etlegacy/commit/2767d15c67fe0680178d9cc85ed4cf2ad1d88ad0.patch?full_index=1"; + hash = "sha256-rGfNIWb9zohk1QJLrYg9nqw6sMvXM0IbIl9kvYXRBuk="; + }) + ]; + nativeBuildInputs = [ cjson cmake @@ -104,6 +115,5 @@ stdenv.mkDerivation { gameplay is still considered unmatched by many, despite its great age. ''; maintainers = with lib.maintainers; [ ashleyghooper drupol ]; - platforms = lib.platforms.linux; }; } From b7e33cda3254bf887efc624ee1e3ecd17a929fd3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 2 Dec 2024 12:37:25 +0100 Subject: [PATCH 2/3] etlegacy-unwrapped: add more compilation flags --- pkgs/by-name/et/etlegacy-unwrapped/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index a080a17226f0..b675fb076c2e 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -90,10 +90,19 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCROSS_COMPILE32=0" + "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SERVER=1" "-DBUILD_CLIENT=1" + "-DBUNDLED_ZLIB=0" + "-DBUNDLED_CJSON=0" "-DBUNDLED_JPEG=0" "-DBUNDLED_LIBS=0" + "-DBUNDLED_FREETYPE=0" + "-DBUNDLED_OGG_VORBIS=0" + "-DBUNDLED_OPENAL=0" + "-DBUNDLED_PNG=0" + "-DBUNDLED_THEORA=0" + "-DBUNDLED_MINIZIP=0" "-DINSTALL_EXTRA=0" "-DINSTALL_OMNIBOT=0" "-DINSTALL_GEOIP=0" From 59a78fb6055d2b5a121a566bd7784b1e2f5c0b3d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 2 Dec 2024 12:38:42 +0100 Subject: [PATCH 3/3] etlegacy-unwrapped: autoformat nixfmt --- .../by-name/et/etlegacy-unwrapped/package.nix | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index b675fb076c2e..f7e14dd8c3d3 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, writeShellApplication -, fetchFromGitHub -, fetchpatch -, cjson -, cmake -, git -, makeBinaryWrapper -, unzip -, curl -, freetype -, glew -, libjpeg -, libogg -, libpng -, libtheora -, lua5_4 -, minizip -, openal -, SDL2 -, sqlite -, zlib +{ + lib, + stdenv, + writeShellApplication, + fetchFromGitHub, + fetchpatch, + cjson, + cmake, + git, + makeBinaryWrapper, + unzip, + curl, + freetype, + glew, + libjpeg, + libogg, + libpng, + libtheora, + lua5_4, + minizip, + openal, + SDL2, + sqlite, + zlib, }: let version = "2.83.1"; @@ -123,6 +124,9 @@ stdenv.mkDerivation { for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age. ''; - maintainers = with lib.maintainers; [ ashleyghooper drupol ]; + maintainers = with lib.maintainers; [ + ashleyghooper + drupol + ]; }; }