azahar: 2123.4.1 -> 2124 (#480378)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt

index 66cbbd52ed..a8b9d41e4e 100644

--- a/externals/CMakeLists.txt

+++ b/externals/CMakeLists.txt

@@ -230,13 +230,8 @@

     )

     target_link_libraries(zstd_seekable PUBLIC libzstd_static)

-    target_link_libraries(libzstd_static INTERFACE zstd_seekable)

-

-    add_library(zstd ALIAS libzstd_static)

-

-    install(TARGETS zstd_seekable

-        EXPORT zstdExports

-    )

+    add_library(zstd INTERFACE)

+    target_link_libraries(zstd INTERFACE libzstd_static zstd_seekable)

 endif()

 # ENet

diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp

index 1e38877a1c..ac85ea1978 100644

--- a/src/common/zstd_compression.cpp

+++ b/src/common/zstd_compression.cpp

@@ -13,7 +13,7 @@

 #include <mutex>

 #include <sstream>

 #include <zstd.h>

-#include <zstd/contrib/seekable_format/zstd_seekable.h>

+#include <zstd_seekable.h>

 #include <boost/serialization/base_object.hpp>

 #include <boost/serialization/unique_ptr.hpp>

  gamemode,

  enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,

  nix-update-script,

  fetchpatch2,

}:

let

  inherit (lib)

in

stdenv.mkDerivation (finalAttrs: {

  pname = "azahar";

  version = "2123.4.1";

  version = "2124";

  src = fetchzip {

    url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";

    hash = "sha256-86i6GMnonQ8SeeDiOH1XSl3rHamnMTgPnkaeJOlAIuI=";

    hash = "sha256-k/Rz7hiYtX0tVW2lrrEwiB8LanvAuhXHxPC79Dy4aUI=";

  };

  patches = [

    # https://github.com/azahar-emu/azahar/pull/1305

    ./fix-zstd-seekable-include.patch

    # TODO: Remove in next release

    (fetchpatch2 {

      url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1";

      hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg=";

    })

  ];

  strictDeps = true;

  nativeBuildInputs = [

    cmake

    vulkan-headers

    xbyak

    # https://github.com/azahar-emu/azahar/pull/1281

    # https://github.com/azahar-emu/azahar/issues/1283

    # spirv-tools

    # spirv-headers

    # Azahar uses zstd_seekable which is not currently packaged in nixpkgs

    # zstd