diff --git a/ci/OWNERS b/ci/OWNERS
index e08961b38210..43ef6f666651 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -74,8 +74,6 @@
 /pkgs/build-support/bintools-wrapper             @Ericson2314
 /pkgs/build-support/setup-hooks                  @Ericson2314
 /pkgs/build-support/setup-hooks/arrayUtilities   @ConnorBaker
-/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
-/pkgs/by-name/au/auto-patchelf                   @layus
 
 ## Format generators/serializers
 /pkgs/pkgs-lib                                   @Stunkymonkey @h7x4
diff --git a/pkgs/build-support/setup-hooks/add-bin-to-path.sh b/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/add-bin-to-path.sh
rename to pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
diff --git a/pkgs/by-name/ad/addBinToPathHook/package.nix b/pkgs/by-name/ad/addBinToPathHook/package.nix
new file mode 100644
index 000000000000..e8a208611c52
--- /dev/null
+++ b/pkgs/by-name/ad/addBinToPathHook/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "add-bin-to-path-hook";
+  meta.license = lib.licenses.mit;
+} ./add-bin-to-path.sh
diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix
index adff3a5e40c0..7823a55c72e5 100644
--- a/pkgs/by-name/au/auto-patchelf/package.nix
+++ b/pkgs/by-name/au/auto-patchelf/package.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation {
     mainProgram = "auto-patchelf";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ Scrumplex ];
+    maintainers = with lib.maintainers; [
+      Scrumplex
+      layus
+    ];
   };
 }
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/auto-patchelf.sh
rename to pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
diff --git a/pkgs/by-name/au/autoPatchelfHook/package.nix b/pkgs/by-name/au/autoPatchelfHook/package.nix
new file mode 100644
index 000000000000..c537f113afcf
--- /dev/null
+++ b/pkgs/by-name/au/autoPatchelfHook/package.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  makeSetupHook,
+  auto-patchelf,
+  bintools,
+  stdenv,
+}:
+
+makeSetupHook {
+  name = "auto-patchelf-hook";
+  propagatedBuildInputs = [
+    auto-patchelf
+    bintools
+  ];
+  substitutions = {
+    hostPlatform = stdenv.hostPlatform.config;
+  };
+  meta = {
+    maintainers = with lib.maintainers; [ layus ];
+  };
+} ./auto-patchelf.sh
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/by-name/au/autoreconfHook/autoreconf.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/autoreconf.sh
rename to pkgs/by-name/au/autoreconfHook/autoreconf.sh
diff --git a/pkgs/by-name/au/autoreconfHook/package.nix b/pkgs/by-name/au/autoreconfHook/package.nix
new file mode 100644
index 000000000000..b3f1eefbb247
--- /dev/null
+++ b/pkgs/by-name/au/autoreconfHook/package.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  makeSetupHook,
+  autoconf,
+  automake,
+  gettext,
+  libtool,
+}:
+makeSetupHook {
+  name = "autoreconf-hook";
+  propagatedBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+  ];
+  meta.license = lib.licenses.mit;
+} ./autoreconf.sh
diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/by-name/di/dieHook/die.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/die.sh
rename to pkgs/by-name/di/dieHook/die.sh
diff --git a/pkgs/by-name/di/dieHook/package.nix b/pkgs/by-name/di/dieHook/package.nix
new file mode 100644
index 000000000000..e5bb76370426
--- /dev/null
+++ b/pkgs/by-name/di/dieHook/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "die-hook";
+  meta.license = lib.licenses.mit;
+} ./die.sh
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
rename to pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
diff --git a/pkgs/by-name/fi/fixDarwinDylibNames/package.nix b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
new file mode 100644
index 000000000000..3caba19ec6da
--- /dev/null
+++ b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  targetPackages,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "fix-darwin-dylib-names-hook";
+  substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; };
+  meta = {
+    platforms = lib.platforms.darwin;
+    license = lib.licenses.mit;
+  };
+} ./fix-darwin-dylib-names.sh
diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/by-name/go/gogUnpackHook/gog-unpack.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/gog-unpack.sh
rename to pkgs/by-name/go/gogUnpackHook/gog-unpack.sh
diff --git a/pkgs/by-name/go/gogUnpackHook/package.nix b/pkgs/by-name/go/gogUnpackHook/package.nix
new file mode 100644
index 000000000000..d47a750ad961
--- /dev/null
+++ b/pkgs/by-name/go/gogUnpackHook/package.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  makeSetupHook,
+  innoextract,
+  file-rename,
+}:
+
+makeSetupHook {
+  name = "gog-unpack-hook";
+  propagatedBuildInputs = [
+    innoextract
+    file-rename
+  ];
+  meta.license = lib.licenses.mit;
+} ./gog-unpack.sh
diff --git a/pkgs/by-name/se/setJavaClassPath/package.nix b/pkgs/by-name/se/setJavaClassPath/package.nix
new file mode 100644
index 000000000000..f02a40c4f225
--- /dev/null
+++ b/pkgs/by-name/se/setJavaClassPath/package.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "set-java-classpath-hook";
+  meta.license = lib.licenses.mit;
+} ./set-java-classpath.sh
diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/set-java-classpath.sh
rename to pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
diff --git a/pkgs/by-name/sh/shortenPerlShebang/package.nix b/pkgs/by-name/sh/shortenPerlShebang/package.nix
new file mode 100644
index 000000000000..7b8037a44709
--- /dev/null
+++ b/pkgs/by-name/sh/shortenPerlShebang/package.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  makeSetupHook,
+  dieHook,
+}:
+
+makeSetupHook {
+  name = "shorten-perl-shebang-hook";
+  propagatedBuildInputs = [ dieHook ];
+  meta.license = lib.licenses.mit;
+} ./shorten-perl-shebang.sh
diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/shorten-perl-shebang.sh
rename to pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
diff --git a/pkgs/by-name/st/stripJavaArchivesHook/package.nix b/pkgs/by-name/st/stripJavaArchivesHook/package.nix
new file mode 100644
index 000000000000..699fd78e73bd
--- /dev/null
+++ b/pkgs/by-name/st/stripJavaArchivesHook/package.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  makeSetupHook,
+  strip-nondeterminism,
+}:
+
+makeSetupHook {
+  name = "strip-java-archives-hook";
+  propagatedBuildInputs = [ strip-nondeterminism ];
+  meta.license = lib.licenses.mit;
+} ./strip-java-archives.sh
diff --git a/pkgs/build-support/setup-hooks/strip-java-archives.sh b/pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/strip-java-archives.sh
rename to pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc448d0e2a6e..439e0435a6cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -243,14 +243,6 @@ with pkgs;
     in
     recurseIntoAttrs arrayUtilitiesPackages;
 
-  addBinToPathHook = callPackage (
-    { makeSetupHook }:
-    makeSetupHook {
-      name = "add-bin-to-path-hook";
-      meta.license = lib.licenses.mit;
-    } ../build-support/setup-hooks/add-bin-to-path.sh
-  ) { };
-
   aider-chat-with-playwright = aider-chat.withOptional { withPlaywright = true; };
 
   aider-chat-with-browser = aider-chat.withOptional { withBrowser = true; };
@@ -261,51 +253,14 @@ with pkgs;
 
   aider-chat-full = aider-chat.withOptional { withAll = true; };
 
-  autoreconfHook = callPackage (
-    {
-      makeSetupHook,
-      autoconf,
-      automake,
-      gettext,
-      libtool,
-    }:
-    makeSetupHook {
-      name = "autoreconf-hook";
-      propagatedBuildInputs = [
-        autoconf
-        automake
-        gettext
-        libtool
-      ];
-      meta.license = lib.licenses.mit;
-    } ../build-support/setup-hooks/autoreconf.sh
-  ) { };
-
   autoreconfHook269 = autoreconfHook.override {
     autoconf = autoconf269;
   };
 
-  autoPatchelfHook = makeSetupHook {
-    name = "auto-patchelf-hook";
-    propagatedBuildInputs = [
-      auto-patchelf
-      bintools
-    ];
-    substitutions = {
-      hostPlatform = stdenv.hostPlatform.config;
-    };
-  } ../build-support/setup-hooks/auto-patchelf.sh;
-
   appimageTools = callPackage ../build-support/appimage { };
 
   appimageupdate-qt = appimageupdate.override { withQtUI = true; };
 
-  stripJavaArchivesHook = makeSetupHook {
-    name = "strip-java-archives-hook";
-    propagatedBuildInputs = [ strip-nondeterminism ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/strip-java-archives.sh;
-
   ensureNewerSourcesHook =
     { year }:
     makeSetupHook
@@ -352,15 +307,6 @@ with pkgs;
     meta.license = lib.licenses.mit;
   } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh;
 
-  gogUnpackHook = makeSetupHook {
-    name = "gog-unpack-hook";
-    propagatedBuildInputs = [
-      innoextract
-      file-rename
-    ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/gog-unpack.sh;
-
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
   buildFHSEnv = buildFHSEnvBubblewrap;
@@ -434,11 +380,6 @@ with pkgs;
 
   diffPlugins = (callPackage ../build-support/plugins.nix { }).diffPlugins;
 
-  dieHook = makeSetupHook {
-    name = "die-hook";
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/die.sh;
-
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
   dockerTools = callPackage ../build-support/docker {
@@ -855,12 +796,6 @@ with pkgs;
 
   setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
 
-  shortenPerlShebang = makeSetupHook {
-    name = "shorten-perl-shebang-hook";
-    propagatedBuildInputs = [ dieHook ];
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/shorten-perl-shebang.sh;
-
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
   srcOnly = callPackage ../build-support/src-only { };
@@ -913,27 +848,6 @@ with pkgs;
 
   inherit (lib.systems) platforms;
 
-  setJavaClassPath = makeSetupHook {
-    name = "set-java-classpath-hook";
-    meta.license = lib.licenses.mit;
-  } ../build-support/setup-hooks/set-java-classpath.sh;
-
-  fixDarwinDylibNames = callPackage (
-    {
-      lib,
-      targetPackages,
-      makeSetupHook,
-    }:
-    makeSetupHook {
-      name = "fix-darwin-dylib-names-hook";
-      substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; };
-      meta = {
-        platforms = lib.platforms.darwin;
-        license = lib.licenses.mit;
-      };
-    } ../build-support/setup-hooks/fix-darwin-dylib-names.sh
-  ) { };
-
   writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { };
 
   desktopToDarwinBundle = makeSetupHook {