From d4c11beaf170365931764857f04a63cfa56d2f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 28 Aug 2025 09:38:44 +0200
Subject: [PATCH 1/2] feh: get rid of generic arguments

---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fdd7cd5186a0..09c9d15efb99 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   xorg,
-  imlib2,
+  imlib2Full,
   libjpeg,
   libpng,
   curl,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXt
     xorg.libX11
     xorg.libXinerama
-    imlib2
+    imlib2Full
     libjpeg
     libpng
     curl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaa461e12614..9c0a9779f47f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11620,9 +11620,7 @@ with pkgs;
 
   fclones = callPackage ../tools/misc/fclones { };
 
-  feh = callPackage ../applications/graphics/feh {
-    imlib2 = imlib2Full;
-  };
+  feh = callPackage ../applications/graphics/feh { };
 
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };

From 63aa3b433f2ea5b3735549ab8045e063c705f299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 28 Aug 2025 09:39:52 +0200
Subject: [PATCH 2/2] feh: move to pkgs/by-name

---
 .../graphics/feh/default.nix => by-name/fe/feh/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/feh/default.nix => by-name/fe/feh/package.nix} (100%)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/by-name/fe/feh/package.nix
similarity index 100%
rename from pkgs/applications/graphics/feh/default.nix
rename to pkgs/by-name/fe/feh/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0a9779f47f..66ee99867806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11620,8 +11620,6 @@ with pkgs;
 
   fclones = callPackage ../tools/misc/fclones { };
 
-  feh = callPackage ../applications/graphics/feh { };
-
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };