diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-10-25 23:01:45 +0100 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-10-26 12:50:27 +0000 |
| commit | 3046935bfea1f2b4b829f38a3b14f30b13b5f9c7 (patch) | |
| tree | a4fb2515dac7aab2cce0b6f7184807777be57021 /pkgs/games | |
| parent | 1ce5a446bb17c4d440c1159660eff6cdea7f66a4 (diff) | |
| download | nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar.gz nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar.bz2 nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar.lz nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar.xz nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.tar.zst nixpkgs-3046935bfea1f2b4b829f38a3b14f30b13b5f9c7.zip | |
warzone2100: fix build against curl-8.4
Without the change the builds fails as
https://hydra.nixos.org/log/536ibf1x7xzfnqr0m5shn09x75cjcaf2-warzone2100-4.3.5.drv:
error: 'CURLSSLBACKEND_NSS' is deprecated: since 8.3.0. [-Werror=deprecated-declarations]
1273 | const std::vector<curl_sslbackend> backendPreferencesOrder = {CURLSSLBACKEND_SCHANNEL, CURLSSLBACKEND_DARWINSSL, CURLSSLBACKEND_GNUTLS, CURLSSLBACKEND_NSS};
The change pulls in upstream fix.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/warzone2100/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 22a2be30834..61df2e54c22 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake , ninja , p7zip @@ -53,6 +54,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; }; + patches = [ + # Upstream patch for curl-8.4 support, + # TODO: remove on next release. + (fetchpatch { + name = "curl-8.4.patch"; + url = "https://github.com/Warzone2100/warzone2100/commit/db1cf70950d4fa6630f37a7bf85f548b48ed53cd.patch"; + hash = "sha256-/jRan5pi7CamZaCaRdfugFmtCbWTKmCt63q0NBuTrFk="; + }) + ]; + buildInputs = [ SDL2 libtheora |