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

commandergenius: 1822release -> 2.2.0

Browse Source 
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
This commit is contained in:
Maximilian Bosch 2018-03-27 21:15:24 +02:00
parent 8fe59b5b29
commit d7894d022c
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/games/commandergenius/default.nix
View File

@ -1,19 +1,24 @@
{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
, libvorbis, libGL, boost, cmake }: , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "commandergenius-${version}"; name = "commandergenius-${version}";
version = "1822release"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gerstrong"; owner = "gerstrong";
repo = "Commander-Genius"; repo = "Commander-Genius";
rev = "v${version}"; 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 ]; nativeBuildInputs = [ cmake pkgconfig ];