diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix index a3f8d21ba257..a65c8c68011d 100644 --- a/pkgs/by-name/de/devilutionx/package.nix +++ b/pkgs/by-name/de/devilutionx/package.nix @@ -12,7 +12,9 @@ SDL2_image, SDL_audiolib, simpleini, + flac, fmt, + libogg, libpng, libtiff, libwebp, @@ -45,20 +47,20 @@ let owner = "diasurgical"; repo = "libzt"; fetchSubmodules = true; - rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8"; - sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew="; + rev = "1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13"; + sha256 = "sha256-/A77ZM4s+br1hYa0OBdjXcWXUXYG+GiEYcW8VB+UJHo="; }; in stdenv.mkDerivation (finalAttrs: { pname = "devilutionx"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; tag = finalAttrs.version; - hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM="; + hash = "sha256-XfHpKERYZ+VCeWx95568FEEZ4UZg3Z4abA8mG4kHjy0="; }; patches = [ ./add-nix-share-path-to-mpq-search.patch ]; @@ -74,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/" ''; + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + nativeBuildInputs = [ cmake pkg-config @@ -83,7 +89,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bzip2 + flac fmt + libogg libpng libtiff libwebp diff --git a/pkgs/by-name/sm/smpq/package.nix b/pkgs/by-name/sm/smpq/package.nix index 817b2077d04b..0048797bfe04 100644 --- a/pkgs/by-name/sm/smpq/package.nix +++ b/pkgs/by-name/sm/smpq/package.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "WITH_KDE" false) + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index cf7f4d7ebcf2..99a4ee90d9af 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "WITH_LIBTOMCRYPT" true) + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; strictDeps = true;