Merge pull request #144569 from aanderse/devilutionx
devilutionx: 1.2.1 -> 1.3.0
This commit is contained in:
Thiago Kenji Okada
GitHub
commit
1671a7beb3
4 changed files with 129 additions and 15 deletions
26
pkgs/applications/misc/smpq/default.nix
Normal file
26
pkgs/applications/misc/smpq/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, cmake, StormLib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "smpq";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz";
|
||||
sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_KDE=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ StormLib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "StormLib MPQ archiving utility";
|
||||
homepage = "https://launchpad.net/smpq";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ aanderse karolchmist ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/libraries/StormLib/default.nix
Normal file
29
pkgs/development/libraries/StormLib/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "StormLib";
|
||||
version = "9.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ladislav-zezula";
|
||||
repo = "StormLib";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DWITH_LIBTOMCRYPT=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ bzip2 libtomcrypt zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ladislav-zezula/StormLib";
|
||||
license = licenses.mit;
|
||||
description = "An open-source project that can work with Blizzard MPQ archives";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ aanderse karolchmist ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,87 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, cmake
|
||||
, pkg-config
|
||||
, gettext
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, fmt
|
||||
, libpng
|
||||
, smpq
|
||||
}:
|
||||
|
||||
let
|
||||
# TODO: submit a PR upstream to allow system copies of these libraries where possible
|
||||
asio = fetchurl {
|
||||
url = "https://github.com/diasurgical/asio/archive/ebeff99f539da23d27c2e8d4bdbc1ee011968644.tar.gz";
|
||||
sha256 = "0vhb4cig40mm0a98i74grpmfkcmby8zxg6vqa38dpryxpgvp5fw8";
|
||||
};
|
||||
|
||||
SDL_audiolib = fetchurl {
|
||||
url = "https://github.com/realnc/SDL_audiolib/archive/aa79660eba4467a44f9dcaecf26b0f0a000abfd7.tar.gz";
|
||||
sha256 = "0z4rizncp6gqsy72b3709zc9fr915wgcwnlx1fhhy7mrczsly630";
|
||||
};
|
||||
|
||||
simpleini = fetchzip {
|
||||
url = "https://github.com/brofield/simpleini/archive/7bca74f6535a37846162383e52071f380c99a43a.zip";
|
||||
sha256 = "07kf1jjbc9v04hsysa6v2wh1m9csf5qz0b1wmlkf9sj00kf47zj7";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "devilutionx";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diasurgical";
|
||||
repo = "devilutionX";
|
||||
rev = version;
|
||||
sha256 = "sha256-PgYlNO1p78d0uiL474bDJOL++SxJfeBLK65czdaylHU=";
|
||||
sha256 = "0acrkqi0pr3cbr5i1a1vfrnxv1n3xmql5d86bm2gywvpdb94xads";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# allow building with system SDL2_image instead of vendored version
|
||||
# this patch can be removed on the next release of devilutionx
|
||||
# see https://github.com/diasurgical/devilutionX/pull/3386
|
||||
(fetchpatch {
|
||||
url = "https://github.com/diasurgical/devilutionX/commit/41ff03e94c02477bffb2d62764e8624c0e06854d.patch";
|
||||
sha256 = "1lrnb9d0dcdyd78rix5rl4p8kkwbnl91llr9fgb86ysm3q58qkvj";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Source/init.cpp --replace "/usr/share/diasurgical/devilutionx/" "${placeholder "out"}/share/diasurgical/devilutionx/"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${SDL2_ttf}/include/SDL2"
|
||||
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
|
||||
];
|
||||
# download dependencies ahead of time
|
||||
substituteInPlace 3rdParty/asio/CMakeLists.txt --replace "https://github.com/diasurgical/asio/archive/ebeff99f539da23d27c2e8d4bdbc1ee011968644.tar.gz" "${asio}"
|
||||
substituteInPlace 3rdParty/SDL_audiolib/CMakeLists.txt --replace "https://github.com/realnc/SDL_audiolib/archive/aa79660eba4467a44f9dcaecf26b0f0a000abfd7.tar.gz" "${SDL_audiolib}"
|
||||
substituteInPlace 3rdParty/simpleini/CMakeLists.txt --replace "https://github.com/brofield/simpleini/archive/7bca74f6535a37846162383e52071f380c99a43a.zip" "${simpleini}"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBINARY_RELEASE=ON"
|
||||
"-DVERSION_NUM=${version}"
|
||||
"-DPACKET_ENCRYPTION=OFF" # FIXME: build with libsodium
|
||||
"-DDISABLE_ZERO_TIER=ON" # FIXME: build with libzt
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
gettext
|
||||
smpq # used to build devilutionx.mpq
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fmt
|
||||
libpng
|
||||
(SDL2.override { withStatic = true; })
|
||||
SDL2_image
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -36,10 +91,10 @@ stdenv.mkDerivation rec {
|
|||
mv devilutionx.app $out/Applications
|
||||
'' else ''
|
||||
install -Dm755 -t $out/bin devilutionx
|
||||
install -Dt $out/share/fonts/truetype ../Packaging/resources/CharisSILB.ttf
|
||||
install -Dt $out/share/diasurgical/devilutionx ../Packaging/resources/devilutionx.mpq
|
||||
|
||||
# TODO: icons and .desktop (see Packages/{debian,fedora}/*)
|
||||
install -Dm755 -t $out/share/diasurgical/devilutionx devilutionx.mpq
|
||||
install -Dm755 -t $out/share/applications ../Packaging/nix/devilutionx-hellfire.desktop ../Packaging/nix/devilutionx.desktop
|
||||
install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilution.png
|
||||
install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilution-hellfire.png
|
||||
'') + ''
|
||||
|
||||
runHook postInstall
|
||||
|
|
@ -50,7 +105,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Diablo build for modern operating systems";
|
||||
longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.karolchmist ];
|
||||
maintainers = with maintainers; [ karolchmist aanderse ];
|
||||
platforms = platforms.linux ++ platforms.windows;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9448,6 +9448,8 @@ with pkgs;
|
|||
|
||||
smu = callPackage ../tools/text/smu { };
|
||||
|
||||
smpq = callPackage ../applications/misc/smpq { };
|
||||
|
||||
sn0int = callPackage ../tools/security/sn0int { };
|
||||
|
||||
snabb = callPackage ../tools/networking/snabb { };
|
||||
|
|
@ -19557,6 +19559,8 @@ with pkgs;
|
|||
|
||||
stb = callPackage ../development/libraries/stb { };
|
||||
|
||||
StormLib = callPackage ../development/libraries/StormLib { };
|
||||
|
||||
stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
|
||||
|
||||
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
|
||||
|
|
|
|||
Loading…
Reference in a new issue