devilutionx: 1.5.4 -> 1.5.5 (#457083)
This commit is contained in:
@@ -12,7 +12,9 @@
|
|||||||
SDL2_image,
|
SDL2_image,
|
||||||
SDL_audiolib,
|
SDL_audiolib,
|
||||||
simpleini,
|
simpleini,
|
||||||
|
flac,
|
||||||
fmt,
|
fmt,
|
||||||
|
libogg,
|
||||||
libpng,
|
libpng,
|
||||||
libtiff,
|
libtiff,
|
||||||
libwebp,
|
libwebp,
|
||||||
@@ -45,20 +47,20 @@ let
|
|||||||
owner = "diasurgical";
|
owner = "diasurgical";
|
||||||
repo = "libzt";
|
repo = "libzt";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8";
|
rev = "1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13";
|
||||||
sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew=";
|
sha256 = "sha256-/A77ZM4s+br1hYa0OBdjXcWXUXYG+GiEYcW8VB+UJHo=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "devilutionx";
|
pname = "devilutionx";
|
||||||
version = "1.5.4";
|
version = "1.5.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "diasurgical";
|
owner = "diasurgical";
|
||||||
repo = "devilutionX";
|
repo = "devilutionX";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM=";
|
hash = "sha256-XfHpKERYZ+VCeWx95568FEEZ4UZg3Z4abA8mG4kHjy0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./add-nix-share-path-to-mpq-search.patch ];
|
patches = [ ./add-nix-share-path-to-mpq-search.patch ];
|
||||||
@@ -74,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
--replace-fail "@assets@" "$out/share/diasurgical/devilutionx/"
|
--replace-fail "@assets@" "$out/share/diasurgical/devilutionx/"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -83,7 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
bzip2
|
bzip2
|
||||||
|
flac
|
||||||
fmt
|
fmt
|
||||||
|
libogg
|
||||||
libpng
|
libpng
|
||||||
libtiff
|
libtiff
|
||||||
libwebp
|
libwebp
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "WITH_KDE" false)
|
(lib.cmakeBool "WITH_KDE" false)
|
||||||
|
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||||
(lib.cmakeBool "WITH_LIBTOMCRYPT" true)
|
(lib.cmakeBool "WITH_LIBTOMCRYPT" true)
|
||||||
|
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user