Merge branch 'staging-next' into staging

3 files changed, 74 insertions, 3 deletions

diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix
new file mode 100644
index 0000000000000..31ced64c46a1e
--- /dev/null
+++ b/pkgs/tools/graphics/gfxreconstruct/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchFromGitHub
+, lib
+, cmake
+, makeWrapper
+, pkg-config
+, python3
+, wayland
+, libX11
+, libxcb
+, lz4
+, vulkan-loader
+, xcbutilkeysyms
+, zlib
+, zstd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gfxreconstruct";
+  version = "0.9.15";
+
+  src = fetchFromGitHub {
+    owner = "LunarG";
+    repo = "gfxreconstruct";
+    rev = "v${version}";
+    hash = "sha256-hIzQ5L0Payj8hlyy5UI7RXgnyhQBPqG7nfbvW2VYvTg=";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [
+    libX11
+    libxcb
+    lz4
+    python3
+    wayland
+    xcbutilkeysyms
+    zlib
+    zstd
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  # The python script searches in subfolders, but we want to search in the same bin directory
+  prePatch = ''
+    substituteInPlace tools/gfxrecon/gfxrecon.py \
+      --replace "scriptdir, '..', cmd" 'scriptdir'
+  '';
+
+  # Fix the path to the layer library
+  postInstall = ''
+    substituteInPlace $out/share/vulkan/explicit_layer.d/VkLayer_gfxreconstruct.json \
+      --replace 'libVkLayer_gfxreconstruct.so' "$out/lib/libVkLayer_gfxreconstruct.so"
+    wrapProgram $out/bin/gfxrecon-replay \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
+  '';
+
+  meta = with lib; {
+    description = "Graphics API Capture and Replay Tools";
+    homepage = "https://github.com/LunarG/gfxreconstruct/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Flakebi ];
+  };
+}
diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix
index 37926550e08b2..adbe371dbb82f 100644
--- a/pkgs/tools/graphics/ldgallery/compiler/default.nix
+++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix
@@ -35,4 +35,8 @@ mkDerivation {
   license = lib.licenses.agpl3Only;
   mainProgram = "ldgallery";
   maintainers = [ lib.maintainers.pacien ];
+
+  # Does not compile with ghc-9.2
+  hydraPlatforms = lib.platforms.none;
+  broken = true;
 }
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 57c7a35e0b94f..a48f18af51e95 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, fetchCrate, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "7.0.0";
+  version = "8.0.0";
   pname = "oxipng";
 
   src = fetchCrate {
     inherit version pname;
-    hash = "sha256-egAt2XypPFxsOuo8RsIXTmFdmBUe+eZh3p3vlnnx8wo=";
+    hash = "sha256-stTwsU9XK3lF4q2sDgb9A1KG1NnhCfVxYWRiBvlmiqQ=";
   };
 
-  cargoHash = "sha256-GbJU31UBdRai2JLEdx9sPh6rJWnU4RlDL8DooI9MCUg=";
+  cargoHash = "sha256-XMIsdv2AHMGs0tDEWe3cfplZU9CbqEkHd7L5eS+V7j0=";
 
   doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;