From ac6a556840edb378409bb2475210c76f411ff49a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 3 Dec 2025 23:35:24 +0000
Subject: [PATCH 1/2] ueberzugpp: cleanup

---
 pkgs/by-name/ue/ueberzugpp/package.nix | 31 ++++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 3e25c1ad7b1c..3d6db325aaa4 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  config,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -30,14 +31,14 @@
   xorg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ueberzugpp";
   version = "2.9.8";
 
   src = fetchFromGitHub {
     owner = "jstkdng";
     repo = "ueberzugpp";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU=";
   };
 
@@ -81,25 +82,21 @@ stdenv.mkDerivation rec {
     xorg.xcbutilimage
   ];
 
-  cmakeFlags =
-    lib.optionals (!enableOpencv) [
-      "-DENABLE_OPENCV=OFF"
-    ]
-    ++ lib.optionals enableWayland [
-      "-DENABLE_WAYLAND=ON"
-    ]
-    ++ lib.optionals (!enableX11) [
-      "-DENABLE_X11=OFF"
-    ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_OPENCV" enableOpencv)
+    (lib.cmakeBool "ENABLE_WAYLAND" enableWayland)
+    (lib.cmakeBool "ENABLE_X11" enableX11)
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Drop in replacement for ueberzug written in C++";
     homepage = "https://github.com/jstkdng/ueberzugpp";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/jstkdng/ueberzugpp/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       aleksana
       wegank
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 0819e63e98ba262df3eeeca04c3d192cc06e9de2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 3 Dec 2025 23:38:17 +0000
Subject: [PATCH 2/2] ueberzugpp: fix with cudaSupport

---
 pkgs/by-name/ue/ueberzugpp/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 3d6db325aaa4..231e2dc9cec3 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -29,6 +29,8 @@
   wayland-scanner,
   enableX11 ? stdenv.hostPlatform.isLinux,
   xorg,
+  cudaSupport ? config.cudaSupport,
+  cudaPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableWayland [
     wayland-scanner
+  ]
+  # Required by opencv when cudaSupport is enabled
+  ++ lib.optionals cudaSupport [
+    (lib.getBin cudaPackages.cuda_nvcc)
   ];
 
   buildInputs = [
@@ -80,6 +86,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableX11 [
     xorg.libX11
     xorg.xcbutilimage
+  ]
+  # Required by opencv when cudaSupport is enabled
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ];
 
   cmakeFlags = [