Merge pull request #42554 from numinit/df
dwarf-fortress: 0.44.10 -> 0.44.11
This commit is contained in:
commit
75e2aca6ca
@ -2854,6 +2854,11 @@
|
||||
github = "nthorne";
|
||||
name = "Niklas Thörne";
|
||||
};
|
||||
numinit = {
|
||||
email = "me@numin.it";
|
||||
github = "numinit";
|
||||
name = "Morgan Jones";
|
||||
};
|
||||
nyanloutre = {
|
||||
email = "paul@nyanlout.re";
|
||||
github = "nyanloutre";
|
||||
|
@ -18,10 +18,7 @@ let
|
||||
else null;
|
||||
|
||||
dwarf-fortress = callPackage ./wrapper {
|
||||
themes = {
|
||||
"phoebus" = phoebus-theme;
|
||||
"cla" = cla-theme;
|
||||
};
|
||||
inherit themes;
|
||||
};
|
||||
|
||||
dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
|
||||
|
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
dfVersion = "0.44.10";
|
||||
version = "${dfVersion}-r1";
|
||||
dfVersion = "0.44.11";
|
||||
version = "${dfVersion}-alpha1";
|
||||
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
|
||||
xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
|
||||
|
||||
arch =
|
||||
if stdenv.system == "x86_64-linux" then "64"
|
||||
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "DFHack";
|
||||
repo = "dfhack";
|
||||
sha256 = "15hz90lfg7asgm4bqa2yi2lkwzrljphb42q6616sriwzs66xia6h";
|
||||
sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@ -72,6 +72,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/DFHack/dfhack/;
|
||||
license = licenses.zlib;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ robbinch a1russell abbradar ];
|
||||
maintainers = with maintainers; [ robbinch a1russell abbradar numinit ];
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dwarf-therapist-original-${version}";
|
||||
version = "40.0.0";
|
||||
version = "40.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dwarf-Therapist";
|
||||
repo = "Dwarf-Therapist";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
|
||||
sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtdeclarative ];
|
||||
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||
'' else null;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
|
||||
maintainers = with maintainers; [ the-kenny abbradar bendlas ];
|
||||
description = "Tool to manage dwarves in a running game of Dwarf Fortress";
|
||||
maintainers = with maintainers; [ the-kenny abbradar bendlas numinit ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;
|
||||
|
@ -9,7 +9,7 @@ with lib;
|
||||
|
||||
let
|
||||
baseVersion = "44";
|
||||
patchVersion = "10";
|
||||
patchVersion = "11";
|
||||
dfVersion = "0.${baseVersion}.${patchVersion}";
|
||||
|
||||
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
|
||||
@ -21,15 +21,15 @@ let
|
||||
srcs = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
|
||||
sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2";
|
||||
sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
|
||||
sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n";
|
||||
sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
|
||||
sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
|
||||
sha256 = "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx";
|
||||
};
|
||||
};
|
||||
|
||||
@ -88,6 +88,6 @@ stdenv.mkDerivation {
|
||||
inherit homepage;
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = attrNames srcs;
|
||||
maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
|
||||
maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
|
||||
};
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2016-1_196";
|
||||
dfVersion = "0.44.10";
|
||||
dfVersion = "0.44.11";
|
||||
inherit soundPack;
|
||||
name = "soundsense-${version}";
|
||||
src = fetchzip {
|
||||
|
@ -3,7 +3,7 @@
|
||||
, ncurses, glib, gtk2, libsndfile, zlib
|
||||
}:
|
||||
|
||||
let dfVersion = "0.44.10"; in
|
||||
let dfVersion = "0.44.11"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwarf_fortress_unfuck-${dfVersion}";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
owner = "svenstaro";
|
||||
repo = "dwarf_fortress_unfuck";
|
||||
rev = dfVersion;
|
||||
sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
|
||||
sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -20,12 +20,26 @@ stdenv.mkDerivation {
|
||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
''CFLAGS="-fkeep-inline-functions"''
|
||||
''CXXFLAGS="-fkeep-inline-functions"''
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
libSM SDL SDL_image SDL_ttf glew openalSoft
|
||||
ncurses gtk2 libsndfile zlib libGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace \
|
||||
'set(CMAKE_BUILD_TYPE Release)' \
|
||||
'set(CMAKE_BUILD_TYPE Debug)'
|
||||
'';
|
||||
|
||||
# Don't strip unused symbols; dfhack hooks into some of them.
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user