@@ -1,73 +1,59 @@
11{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
2−, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }:
2+, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }:
33
44let
5− mygui_ = mygui.override {
6− inherit stdenv;
7− };
8− terra_ = symlinkJoin {
9− name = "terra";
10− paths = [ terra.static terra.dev ];
11− };
5+ version = "0.7.0-alpha";
126 TES3MP = fetchFromGitHub {
137 owner = "TES3MP";
148 repo = "openmw-tes3mp";
15− rev = "f61664ff6d521e10db761a550c97c6edce8f0046";
16− sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb";
9+ rev = version;
10+ sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q";
1711 };
1812 CallFF = fetchFromGitHub {
1913 owner = "Koncord";
2014 repo = "CallFF";
21− rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9";
22− sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57";
15+ rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b";
16+ sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm";
2317 };
24− RakNet = fetchFromGitHub {
18+ CrabNet = fetchFromGitHub {
2519 owner = "TES3MP";
26− repo = "RakNet";
27− rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba";
28− sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q";
20+ repo = "CrabNet";
21+ rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567";
22+ sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0";
2923 };
30− PluginExamples = fetchFromGitHub {
24+ CoreScripts = fetchFromGitHub {
3125 owner = "TES3MP";
32− repo = "PluginExamples";
33− rev = "213e72f315a8029eec71437e56de0eaeba5b3670";
34− sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b";
26+ repo = "CoreScripts";
27+ rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea";
28+ sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg";
3529 };
3630
3731 fakegit = writeScriptBin "git" ''
3832 #! ${stdenv.shell}
39− if [ "$*" = "rev-list --tags --max-count=1" ] ||
40− [ "$*" = "rev-parse HEAD" ]; then
41− echo "${TES3MP.rev}"
42− else
43− exit 1
44− fi
4533 '';
4634in stdenv.mkDerivation rec {
47− version = "0.6.0";
35+ inherit version;
4836 name = "tes3mp-${version}";
4937
5038 src = fetchFromGitHub {
5139 owner = "GrimKriegor";
5240 repo = "TES3MP-deploy";
53− rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45";
54− sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6";
41+ rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325";
42+ sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn";
5543 };
5644
5745 dontUseCmakeConfigure = true;
5846
5947 nativeBuildInputs = [ cmake makeWrapper fakegit ];
60− buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt
61− ncurses libGL ];
48+ buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt
49+ ncurses libGL luajit ];
6250
6351 buildPhase = ''
6452 mkdir dependencies keepers
6553 cp --no-preserve=mode -r ${TES3MP} code
66− mkdir code/.git
6754 cp --no-preserve=mode -r ${CallFF} dependencies/callff
68− cp --no-preserve=mode -r ${RakNet} dependencies/raknet
69− cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples
70− ln -s ${terra_} dependencies/terra
55+ cp --no-preserve=mode -r ${CrabNet} dependencies/raknet
56+ cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts
7157
7258 substituteInPlace tes3mp-deploy.sh \
7359 --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out"
@@ -86,6 +72,8 @@ in stdenv.mkDerivation rec {
8672 mv build/resources $prefix/build
8773 mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw
8874 mv keepers $prefix
75+ mv build/tes3mp-credits.md $prefix/build
76+ mv -f $prefix/keepers/version $prefix/build/resources
8977
9078 for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh
9179 do
@@ -100,8 +88,8 @@ in stdenv.mkDerivation rec {
10088 wrapProgram $out/bin/tes3mp-server \
10189 --run "mkdir -p ~/.config/openmw" \
10290 --run "cd ~/.config/openmw" \
103− --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \
104− --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg"
91+ --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \
92+ --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg"
10593 '';
10694
10795 meta = with stdenv.lib; {