Skip to content

Commit

Permalink
arma3-unix-launcher: replace curlpp.src with srcOnly curlpp to resolv…
Browse files Browse the repository at this point in the history
…e build failure / remove unused dependencies (NixOS#354414)
  • Loading branch information
Lassulus authored Dec 15, 2024
2 parents ac51587 + 3ab2140 commit 3ee5d9d
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions pkgs/by-name/ar/arma3-unix-launcher/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
cmake,
curl,
curlpp,
doctest,
srcOnly,
fetchFromGitHub,
fetchurl,
fmt,
nlohmann_json,
qt5,
spdlog,
substituteAll,
trompeloeil,
buildDayZLauncher ? false,
}:
stdenv.mkDerivation (finalAttrs: {
Expand All @@ -36,8 +35,7 @@ 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 {
Expand All @@ -51,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
Expand All @@ -60,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" ];
Expand Down

0 comments on commit 3ee5d9d

Please sign in to comment.