about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-03-31 19:26:01 -0500
committerGitHub <noreply@github.com>2018-03-31 19:26:01 -0500
commit55b88f45659ad4797d2ef722926368d37f439ad2 (patch)
tree97d80fc52ac3ec95ba294d256c5d23c81f9e32c6 /pkgs/games
parent284707e97eacb5917e8845088c71d381c4ca72d4 (diff)
parentd7894d022c8c515f1ee51ddb3554ca3af46d21f5 (diff)
downloadnixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar.gz
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar.bz2
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar.lz
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar.xz
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.tar.zst
nixlib-55b88f45659ad4797d2ef722926368d37f439ad2.zip
Merge pull request #37929 from Ma27/fix-commandergenius
commandergenius: 1822release -> 2.2.0
Diffstat (limited to 'pkgs/games')
-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 ];