From 9e4f215465ec50e9b2a9c68bc556a3850f5c22f1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 3 Jul 2021 16:56:42 +0200 Subject: [PATCH 1/3] warzone2100: better fix for absolute bindir (cherry picked from commit b5b5dbb62d959e743742e75ef342ff9fca392ada) --- pkgs/games/warzone2100/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 7f2ad875d8c..c3eebf203cb 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -84,10 +84,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWZ_DISTRIBUTOR=NixOS" # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute - # path, but this results in an error. - # By resetting it, we let the CMakeLists set it to an accepted value - # based on prefix. - "-DCMAKE_INSTALL_BINDIR=" + # path, but this results in an error: + # + # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following + # > are not also absolute paths: WZ_DATADIR + # + # WZ_DATADIR is based on CMAKE_INSTALL_DATAROOTDIR, so we set that. + # + # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin". + "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" ]; postInstall = lib.optionalString withVideos '' From 8fb41def7c5f928eb5baa6ab3a3f1b3c7b70d831 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 5 Jul 2021 17:53:36 +0200 Subject: [PATCH 2/3] warzone2100: 4.0.1 -> 4.1.0 (cherry picked from commit 299f265ce50861b3733733df5da2506c8e25c054) --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index c3eebf203cb..feadcc7f8b2 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"; + sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0="; }; buildInputs = [ From b69f8981c8fd6ae94f33a8289ab9f81d82ea0ebb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 25 Jul 2021 22:40:25 +0200 Subject: [PATCH 3/3] warzone2100: 4.1.0 -> 4.1.1 (cherry picked from commit 6be2cb762e9a12e9e1086682cd3f86aa35858207) --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index feadcc7f8b2..6f31dcf9be9 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0="; + sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8="; }; buildInputs = [