From fa3d11ad3b5c54ac91bd1bbf5eb14dd5dfc8d2c2 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 26 Nov 2023 19:51:44 +0100
Subject: [PATCH] xsane: remove override libpng

---
 pkgs/applications/graphics/sane/xsane.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix           | 5 +----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index cd64c7b8d44e..471e2141b5b8 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -11,6 +11,7 @@
 , gimpSupport ? false
 , gimp
 , nix-update-script
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -25,6 +26,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/xsane/raw/rawhide/f/xsane-0.998-libpng.patch";
+      hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
+    })
+  ];
+
   preConfigure = ''
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c
     chmod a+rX -R .
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3e5a64dc013..bac97fe97569 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41540,10 +41540,7 @@ with pkgs;
 
   xpad = callPackage ../applications/misc/xpad { };
 
-  xsane = callPackage ../applications/graphics/sane/xsane.nix {
-    libpng = libpng12;
-    sane-backends = sane-backends.override { libpng = libpng12; };
-  };
+  xsane = callPackage ../applications/graphics/sane/xsane.nix { };
 
   xsser = python3Packages.callPackage ../tools/security/xsser { };