about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKarol Chmist <karolchmist@users.noreply.github.com>2019-10-21 02:10:52 +0200
committerAaron Andersen <aaron@fosslib.net>2019-10-20 20:10:52 -0400
commit47f47b46bc463ee14d816ce4f3ef2bb022fb14f9 (patch)
treeaa0754abbe8299ba9bfeacb9e016d6c0702ffbf4
parent64468d41212f56162cbc931163a012f63ee5dcd4 (diff)
downloadnixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar.gz
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar.bz2
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar.lz
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar.xz
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.tar.zst
nixlib-47f47b46bc463ee14d816ce4f3ef2bb022fb14f9.zip
devilutionx: unstable-2019-07-28 -> 0.5.0 (#70971)
devilutionx: unstable-2019-07-28 -> 0.5.0
-rw-r--r--pkgs/games/devilutionx/default.nix17
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;