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

Merge pull request #42554 from numinit/df

Browse Source 
dwarf-fortress: 0.44.10 -> 0.44.11
This commit is contained in:
Matthew Bauer 2018-07-04 16:56:20 -04:00 committed by GitHub
commit 75e2aca6ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -2854,6 +2854,11 @@
github = "nthorne"; github = "nthorne";
name = "Niklas Thörne"; name = "Niklas Thörne";
}; };
numinit = {
email = "me@numin.it";
github = "numinit";
name = "Morgan Jones";
};
nyanloutre = { nyanloutre = {
email = "paul@nyanlout.re"; email = "paul@nyanlout.re";
github = "nyanloutre"; github = "nyanloutre";

7
pkgs/games/dwarf-fortress/default.nix
View File

@ -15,13 +15,10 @@ let
# unfuck is linux-only right now, we will just use it there # unfuck is linux-only right now, we will just use it there
dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { } dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
else null; else null;
dwarf-fortress = callPackage ./wrapper { dwarf-fortress = callPackage ./wrapper {
themes = { inherit themes;
"phoebus" = phoebus-theme;
"cla" = cla-theme;
};
}; };
dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {

10
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@ -5,11 +5,11 @@
}: }:
let let
dfVersion = "0.44.10"; dfVersion = "0.44.11";
version = "${dfVersion}-r1"; version = "${dfVersion}-alpha1";
# revision of library/xml submodule # revision of library/xml submodule
xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
arch = arch =
if stdenv.system == "x86_64-linux" then "64" if stdenv.system == "x86_64-linux" then "64"
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DFHack"; owner = "DFHack";
repo = "dfhack"; repo = "dfhack";
sha256 = "15hz90lfg7asgm4bqa2yi2lkwzrljphb42q6616sriwzs66xia6h"; sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -72,6 +72,6 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/DFHack/dfhack/; homepage = https://github.com/DFHack/dfhack/;
license = licenses.zlib; license = licenses.zlib;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ robbinch a1russell abbradar ]; maintainers = with maintainers; [ robbinch a1russell abbradar numinit ];
}; };
} }

8
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
version = "40.0.0"; version = "40.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dwarf-Therapist"; owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "v${version}"; rev = "v${version}";
sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
}; };
buildInputs = [ qtbase qtdeclarative ]; buildInputs = [ qtbase qtdeclarative ];
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
'' else null; '' else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; description = "Tool to manage dwarves in a running game of Dwarf Fortress";
maintainers = with maintainers; [ the-kenny abbradar bendlas ]; maintainers = with maintainers; [ the-kenny abbradar bendlas numinit ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist;

10
pkgs/games/dwarf-fortress/game.nix
View File

@ -9,7 +9,7 @@ with lib;
let let
baseVersion = "44"; baseVersion = "44";
patchVersion = "10"; patchVersion = "11";
dfVersion = "0.${baseVersion}.${patchVersion}"; dfVersion = "0.${baseVersion}.${patchVersion}";
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@ -21,15 +21,15 @@ let
srcs = { srcs = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2"; sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n"; sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2"; url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g"; sha256 = "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx";
}; };
}; };
@ -88,6 +88,6 @@ stdenv.mkDerivation {
inherit homepage; inherit homepage;
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
platforms = attrNames srcs; platforms = attrNames srcs;
maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
}; };
} }

2
pkgs/games/dwarf-fortress/soundsense.nix
View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2016-1_196"; version = "2016-1_196";
dfVersion = "0.44.10"; dfVersion = "0.44.11";
inherit soundPack; inherit soundPack;
name = "soundsense-${version}"; name = "soundsense-${version}";
src = fetchzip { src = fetchzip {

18
pkgs/games/dwarf-fortress/unfuck.nix
View File

@ -3,7 +3,7 @@
, ncurses, glib, gtk2, libsndfile, zlib , ncurses, glib, gtk2, libsndfile, zlib
}: }:
let dfVersion = "0.44.10"; in let dfVersion = "0.44.11"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dwarf_fortress_unfuck-${dfVersion}"; name = "dwarf_fortress_unfuck-${dfVersion}";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "svenstaro"; owner = "svenstaro";
repo = "dwarf_fortress_unfuck"; repo = "dwarf_fortress_unfuck";
rev = dfVersion; rev = dfVersion;
sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf";
}; };
cmakeFlags = [ cmakeFlags = [
@ -20,12 +20,26 @@ stdenv.mkDerivation {
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
]; ];
makeFlags = [
''CFLAGS="-fkeep-inline-functions"''
''CXXFLAGS="-fkeep-inline-functions"''
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
libSM SDL SDL_image SDL_ttf glew openalSoft libSM SDL SDL_image SDL_ttf glew openalSoft
ncurses gtk2 libsndfile zlib libGL 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 = '' installPhase = ''
install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so
''; '';

2
pkgs/games/dwarf-fortress/wrapper/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = ./dwarf-fortress-init.in; src = ./dwarf-fortress-init.in;
inherit env; inherit env;
exe = if stdenv.isLinux then "libs/Dwarf_Fortress" exe = if stdenv.isLinux then "libs/Dwarf_Fortress"
else "dwarfort.exe"; else "dwarfort.exe";
}; };
runDF = ./dwarf-fortress.in; runDF = ./dwarf-fortress.in;