From 431e18ae5ba957a23c2db5b326cca52dede9aed4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 18 Jan 2025 09:19:36 +0100
Subject: [PATCH 1/3] python313Packages.cyclopts: 3.2.0 -> 3.2.1

Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.2.0...v3.2.1

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.2.1
---
 pkgs/development/python-modules/cyclopts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 71dea8620e2d..cbc291516d53 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.2.0";
+  version = "3.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg=";
+    hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk=";
   };
 
   build-system = [

From b7066ff12f8379abc26fef6f46d67a0920cc39b8 Mon Sep 17 00:00:00 2001
From: Edwin Mackenzie-Owen <edwin.mowen@gmail.com>
Date: Sat, 18 Jan 2025 14:54:07 +0100
Subject: [PATCH 2/3] waypipe: add missing runtime dependencies

Waypipe dynamically loads ffmpeg[^1] and libgbm[^2] at runtime,
therefore their library paths need to be included in the binary's
RUNPATH. libvulkan.so.1 also needs to be in the RUNPATH, because the
ash Rust crate used by Waypipe loads it dynamically at runtime[^3].

https://github.com/NixOS/nixpkgs/pull/374615 removed all
runtimeDependencies and the autoPatchelfHook that adds them to the
RUNPATH.

This commit readds the autoPatchelfHook and adds the three dynamically
loaded libraries to the runtimeDependencies.
In addition, it replaces the mesa buildInput with libgbm (which was used
before https://github.com/NixOS/nixpkgs/pull/373212) because Waypipe
depends only on libgbm.

Resolves https://github.com/NixOS/nixpkgs/issues/374595

[^1]: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/blob/cb53f342af8a3009561e0566ed81962acbde6fc0/wrap-ffmpeg/build.rs#L110-111
[^2]: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/blob/cb53f342af8a3009561e0566ed81962acbde6fc0/wrap-gbm/build.rs#L76-77l
[^3]: https://github.com/ash-rs/ash?tab=readme-ov-file#optional-linking
---
 pkgs/by-name/wa/waypipe/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 0ed176805199..d58ed7329061 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   scdoc,
-  mesa,
+  libgbm,
   lz4,
   zstd,
   ffmpeg,
@@ -55,11 +55,12 @@ llvmPackages.stdenv.mkDerivation rec {
     rustc
     wayland-scanner
     rustPlatform.cargoSetupHook
+    autoPatchelfHook
     rust-bindgen
   ];
 
   buildInputs = [
-    mesa
+    libgbm
     lz4
     zstd
     ffmpeg
@@ -67,6 +68,12 @@ llvmPackages.stdenv.mkDerivation rec {
     vulkan-loader
   ];
 
+  runtimeDependencies = [
+    libgbm
+    ffmpeg.lib
+    vulkan-loader
+  ];
+
   meta = with lib; {
     description = "Network proxy for Wayland clients (applications)";
     longDescription = ''

From 52b9eff35181c2d4b0b79a737f27d2f06eebe75f Mon Sep 17 00:00:00 2001
From: Edwin Mackenzie-Owen <edwin.mowen@gmail.com>
Date: Sat, 18 Jan 2025 17:17:18 +0100
Subject: [PATCH 3/3] waypipe: remove unused arguments

---
 pkgs/by-name/wa/waypipe/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index d58ed7329061..c88051e51496 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -10,20 +10,15 @@
   lz4,
   zstd,
   ffmpeg,
-  libva,
   cargo,
   rustc,
-  git,
   vulkan-headers,
   vulkan-loader,
   shaderc,
-  vulkan-tools,
   llvmPackages,
   autoPatchelfHook,
-  wayland,
   wayland-scanner,
   rust-bindgen,
-  egl-wayland,
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "waypipe";