From 6589625273010658818a00876012d3963dd27f63 Mon Sep 17 00:00:00 2001 From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:30:05 -0800 Subject: [PATCH 1/2] arma3-unix-launcher: replace curlpp.src with srcOnly curlpp to ensure patches are applied --- pkgs/by-name/ar/arma3-unix-launcher/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 104293c9be56..0a9a933c1c86 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -5,6 +5,7 @@ curl, curlpp, doctest, + srcOnly, fetchFromGitHub, fetchurl, fmt, @@ -36,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77"; hash = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; }; - curlpp_src = curlpp.src; doctest_src = doctest; + curlpp_src = srcOnly curlpp; fmt_src = fmt; nlohmann_json_src = nlohmann_json; pugixml_src = fetchFromGitHub { From 3ab2140c5798083f6436ee5887653137b4ad3490 Mon Sep 17 00:00:00 2001 From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:55:34 -0800 Subject: [PATCH 2/2] arma3-unix-launcher: remove unused dependencies --- pkgs/by-name/ar/arma3-unix-launcher/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 0a9a933c1c86..6c15df4cd33a 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -4,7 +4,6 @@ cmake, curl, curlpp, - doctest, srcOnly, fetchFromGitHub, fetchurl, @@ -13,7 +12,6 @@ qt5, spdlog, substituteAll, - trompeloeil, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77"; hash = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw="; }; - doctest_src = doctest; curlpp_src = srcOnly curlpp; fmt_src = fmt; nlohmann_json_src = nlohmann_json; @@ -52,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip"; hash = "sha256-6PQGaPsaxBg/MHVWw2ynYW6LaNSrE9Rd9Q9ZLKFGPFA="; }; - trompeloeil_src = trompeloeil; + # Only required for testing? + doctest_src = null; + trompeloeil_src = null; }) # game won't launch with steam integration anyways, disable it ./disable_steam_integration.patch @@ -61,14 +60,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ qt5.wrapQtAppsHook cmake - ]; - - buildInputs = [ spdlog - curlpp.src curl - qt5.qtbase - qt5.qtsvg + curlpp ]; cmakeFlags = [ "-Wno-dev" ] ++ lib.optionals buildDayZLauncher [ "-DBUILD_DAYZ_LAUNCHER=ON" ];