public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #131553 from fgaz/backport/21.05/warzone2100/4.1.1

This commit is contained in:
Artturi 2021-08-10 05:47:23 +03:00 committed by GitHub
parent b09c989b82 b69f8981c8
commit 9eb3be2890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/warzone2100/default.nix
View File

@ -39,11 +39,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; inherit pname;
version = "4.0.1"; version = "4.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"; sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8=";
}; };
buildInputs = [ buildInputs = [
@ -84,10 +84,15 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DWZ_DISTRIBUTOR=NixOS" "-DWZ_DISTRIBUTOR=NixOS"
# The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute
# path, but this results in an error. # path, but this results in an error:
# By resetting it, we let the CMakeLists set it to an accepted value #
# based on prefix. # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following
"-DCMAKE_INSTALL_BINDIR=" # > 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 '' postInstall = lib.optionalString withVideos ''