Merge pull request #43578 from rardiol/cdda

cataclysm dda 2018-07-15
This commit is contained in:
Franz Pletz
2018-07-15 21:10:05 +00:00
committed by GitHub
+9 -5
View File
@@ -1,16 +1,16 @@
{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa, SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa,
tiles ? true }: tiles ? true, debug ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2017-12-09"; version = "2018-07-15";
name = "cataclysm-dda-git-${version}"; name = "cataclysm-dda-git-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CleverRaven"; owner = "CleverRaven";
repo = "Cataclysm-DDA"; repo = "Cataclysm-DDA";
rev = "24e92956db5587809750283873c242cc0796d7e6"; rev = "e1e5d81";
sha256 = "1a7kdmx76na4g65zra01qaq98lxp9j2dl9ddv09r0p5yxaizw68z"; sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
makeFlags = with stdenv.lib; [ makeFlags = with stdenv.lib; [
"PREFIX=$(out)" "PREFIX=$(out)"
"LUA=1" "LUA=1"
"RELEASE=1"
"USE_HOME_DIR=1" "USE_HOME_DIR=1"
"LANGUAGES=all" "LANGUAGES=all"
"VERSION=git-${version}-${substring 0 8 src.rev}" "VERSION=git-${version}-${substring 0 8 src.rev}"
@@ -41,6 +40,8 @@ stdenv.mkDerivation rec {
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"NATIVE=osx" "NATIVE=osx"
"CLANG=1" "CLANG=1"
] ++ optionals (! debug) [
"RELEASE=1"
]; ];
postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) '' postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) ''
@@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
# make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1
enableParallelBuilding = false; enableParallelBuilding = false;
dontStrip = debug;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A free, post apocalyptic, zombie infested rogue-like"; description = "A free, post apocalyptic, zombie infested rogue-like";
longDescription = '' longDescription = ''
@@ -89,6 +92,7 @@ stdenv.mkDerivation rec {
substances or radiation, now more closely resemble insects, birds or fish substances or radiation, now more closely resemble insects, birds or fish
than their original form. than their original form.
''; '';
maintainers = with maintainers; [ rardiol ];
homepage = https://cataclysmdda.org/; homepage = https://cataclysmdda.org/;
license = licenses.cc-by-sa-30; license = licenses.cc-by-sa-30;
platforms = platforms.unix; platforms = platforms.unix;