diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 09:55:24 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 09:55:24 +0200 |
commit | b6ba25ce95e5a26839a1be58a8f26c19d5231192 (patch) | |
tree | ab03ccd2f588278c7d9b2a01ce61d96941fca217 /pkgs/games | |
parent | a110c8e69dbd937f76bb3e0dd6b6df916c7fbd30 (diff) | |
parent | 7474d9c3bfc4e6485d61a44e385a1f5384ea7468 (diff) | |
download | nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar.gz nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar.bz2 nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar.lz nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar.xz nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.tar.zst nixlib-b6ba25ce95e5a26839a1be58a8f26c19d5231192.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/devilutionx/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 117ebcc1ac18..3241e6dd387f 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: -stdenv.mkDerivation { - version = "unstable-2019-07-28"; +stdenv.mkDerivation rec { + version = "0.5.0"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; - rev = "b2f358874705598ec139f290b21e340c73d250f6"; - sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f"; + rev = version; + sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b"; }; NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2"; - # compilation will fail due to -Werror=format-security - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; installPhase = '' runHook preInstall + '' + (if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv devilutionx.app $out/Applications + '' else '' mkdir -p $out/bin cp devilutionx $out/bin + '') + '' runHook postInstall ''; @@ -30,6 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/diasurgical/devilutionX"; 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 ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; |