summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnund <anundm@gmail.com>2022-12-29 02:28:13 +1100
committerAnund <anundm@gmail.com>2022-12-29 02:28:13 +1100
commitd3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa (patch)
tree0e3da93d0b3fce6dd9b661ebafea30a538100669
parent4d5535c90c817917015bf26794d29802e254cb32 (diff)
downloadnixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar.gz
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar.bz2
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar.lz
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar.xz
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.tar.zst
nixpkgs-d3291f4f2ae9e96bb542caae58ca6cf9cd1df3fa.zip
devilutionx: 1.4.0 -> 1.4.1
Removed SDL_AUDIOLIB patch as it is included in the 1.4.1 release,
updated libzt dependency to match
https://github.com/diasurgical/devilutionX/commit/6bf474a6ba
-rw-r--r--pkgs/games/devilutionx/default.nix15
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index c7943b24c95..94838596a12 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -42,8 +42,8 @@ let
     owner = "diasurgical";
     repo = "libzt";
     fetchSubmodules = true;
-    rev = "a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02";
-    sha256 = "sha256-tyIPt+7OTi5W+5X/ixQP1puOKdhrqRZtpwXlWFBFpc8=";
+    rev = "37a2efb0b925df632299ef07dc78c0af5f6b4756";
+    sha256 = "sha256-+o4ZTVqh4MDZES9m7mkfkMRlRDMBytDBuA0QIlnp73U=";
   };
 
   # missing pkg-config and/or cmake file
@@ -55,22 +55,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "devilutionx";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
     rev = version;
-    sha256 = "sha256-uuIPTdgGpHA8j1M8b+kfnBuiJ5mdS9rckvEfn2h7lmo=";
+    sha256 = "sha256-l0BhL+DXtkG2PdFqmkL0KJv41zl3N/AcuLmzw2j3jXY=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/diasurgical/devilutionX/commit/03b22352fc9e1ecb88b20a053c90c04a50717267.patch";
-      sha256 = "sha256-5aAwi1NV8P+nLLbEEnlwLGNQCQBb0nQkIVe5tR5Shsw=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace Source/init.cpp --replace "/usr/share/diasurgical/devilutionx/" "${placeholder "out"}/share/diasurgical/devilutionx/"