summaryrefslogtreecommitdiffstats
path: root/pkgs/games/commandergenius
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2018-03-27 21:15:24 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2018-03-28 09:37:36 +0200
commitd7894d022c8c515f1ee51ddb3554ca3af46d21f5 (patch)
treefc39df5ae746bd6ec59e27a03941b80b515b0132 /pkgs/games/commandergenius
parent8fe59b5b297543c1186190bda7ba1b2ac29876a2 (diff)
commandergenius: 1822release -> 2.2.0
The `1822-release` build breaks on Hydra, some days ago the stable `2.2.0` release has been tagged on upstream. It required some new build inputs (zlib, curl, SDL2_mixer, python3) and some minor changes in the cmakeFlags and makeFlags for the build. See https://hydra.nixos.org/build/71818713/log See ticket #36453 and #31747
Diffstat (limited to 'pkgs/games/commandergenius')
-rw-r--r--pkgs/games/commandergenius/default.nix15
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index f77dfe8ba945..70413f0f941b 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -1,19 +1,24 @@
{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
-, libvorbis, libGL, boost, cmake }:
-
+, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
+}:
stdenv.mkDerivation rec {
name = "commandergenius-${version}";
- version = "1822release";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "gerstrong";
repo = "Commander-Genius";
rev = "v${version}";
- sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8";
+ sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph";
};
- buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ];
+ buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
+
+ preConfigure = ''
+ export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share"
+ export makeFlags="$makeFlags DESTDIR=$(out)"
+ '';
nativeBuildInputs = [ cmake pkgconfig ];