arma3-testing

DrymarchonShaun · Nov 8, 2024 · f520e31 · f520e31
1 parent 318f47f
commit f520e31
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git 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,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 {
@@ -51,7 +51,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
@@ -60,14 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     qt5.wrapQtAppsHook
     cmake
-  ];
-
-  buildInputs = [
     spdlog
-    curlpp.src
     curl
-    qt5.qtbase
-    qt5.qtsvg
   ];
 
   cmakeFlags = [ "-Wno-dev" ] ++ lib.optionals buildDayZLauncher [ "-DBUILD_DAYZ_LAUNCHER=ON" ];
@@ -79,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
       # Launcher
       mit
       # Steamworks SDK
-      unfree
+      # unfree
     ];
     maintainers = with lib.maintainers; [ DrymarchonShaun ];
     mainProgram = "arma3-unix-launcher";

diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
@@ -1,13 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "curlpp";
-  version = "0.8.1";
+  version = "0.8.1-unstable-2024-05-29";
+
   src = fetchFromGitHub {
     owner = "jpbarrette";
     repo = "curlpp";
-    rev = "v${version}";
-    sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk";
+    rev = "8840ec806a75a6def9ed07845a620f6d170e5821";
+    hash = "sha256-WkYCb+830RgMrM6wRFunPxcvcziNa7qCjUqqlwlJHAk=";
   };
 
   patches = [
@@ -18,6 +25,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ curl ];
   nativeBuildInputs = [ cmake ];
 
+  postFixup = ''
+    substituteInPlace $out/lib/pkgconfig/*.pc \
+      --replace-fail '=''${exec_prefix}//' '=/' \
+      --replace-fail '=''${prefix}//' '=/'
+  '';
+
   meta = with lib; {
     homepage = "https://www.curlpp.org/";
     description = "C++ wrapper around libcURL";