From 26d0fd4b685539be2be59a93e2bc1f85ab7c73df Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 16 Jan 2026 09:06:10 -0600
Subject: [PATCH] libpng: migrate to pkgs/by-name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This moves libpng to the by-name directory layout:

  pkgs/development/libraries/libpng → pkgs/by-name/li/libpng

The package is renamed to package.nix.

The previous Darwin-specific stdenv override (using darwin.bootstrapStdenv
to avoid xcbuild recursion) is preserved by introducing a local stdenv'
binding and using it for mkDerivation. This keeps the bootstrap behavior
identical to the old location.

The old libpng entry in all-packages.nix is removed, since by-name
packages are now auto-discovered.
---
 pkgs/{development/libraries => by-name/li}/libpng/12.nix   | 0
 .../libpng/default.nix => by-name/li/libpng/package.nix}   | 5 +++--
 pkgs/top-level/all-packages.nix                            | 7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)
 rename pkgs/{development/libraries => by-name/li}/libpng/12.nix (100%)
 rename pkgs/{development/libraries/libpng/default.nix => by-name/li/libpng/package.nix} (92%)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/by-name/li/libpng/12.nix
similarity index 100%
rename from pkgs/development/libraries/libpng/12.nix
rename to pkgs/by-name/li/libpng/12.nix
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/by-name/li/libpng/package.nix
similarity index 92%
rename from pkgs/development/libraries/libpng/default.nix
rename to pkgs/by-name/li/libpng/package.nix
index c16b6d4a17a2..ddb7e305a837 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/by-name/li/libpng/package.nix
@@ -5,6 +5,7 @@
   zlib,
   apngSupport ? true,
   testers,
+  darwin,
 }:
 
 assert zlib != null;
@@ -16,9 +17,9 @@ let
     hash = "sha256-aH3cDHyxKKPqWOFZtRKSUlN8J+3gwyqT8R8DEn8MAWU=";
   };
   whenPatched = lib.optionalString apngSupport;
-
+  stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
 in
-stdenv.mkDerivation (finalAttrs: {
+stdenv'.mkDerivation (finalAttrs: {
   pname = "libpng" + whenPatched "-apng";
   version = "1.6.53";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33d2fdea20f6..4b7faaff7894 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7151,13 +7151,6 @@ with pkgs;
   libpeas = callPackage ../development/libraries/libpeas { };
   libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
 
-  libpng = callPackage ../development/libraries/libpng {
-    stdenv =
-      # libpng is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
-      # that does not propagate xcrun.
-      if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
-  };
-
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
 
   inherit