diff --git a/pkgs/development/libraries/libbutl/install-h-files.patch b/pkgs/by-name/li/libbutl/install-h-files.patch
similarity index 100%
rename from pkgs/development/libraries/libbutl/install-h-files.patch
rename to pkgs/by-name/li/libbutl/install-h-files.patch
diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/by-name/li/libbutl/package.nix
similarity index 84%
rename from pkgs/development/libraries/libbutl/default.nix
rename to pkgs/by-name/li/libbutl/package.nix
index c653d43ea45c..5996967cef24 100644
--- a/pkgs/development/libraries/libbutl/default.nix
+++ b/pkgs/by-name/li/libbutl/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
-  build2,
-  DarwinTools,
+  # Dependency of build2, so we must break cycle for this
+  build2-bootstrap,
+  darwin,
   fetchurl,
   libuuid,
   enableShared ? !stdenv.hostPlatform.isStatic,
@@ -25,10 +26,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    build2
+    build2-bootstrap
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    DarwinTools
+    darwin.DarwinTools
   ];
 
   patches = [
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
 
   # Should be true for anything built with build2,
   # but especially important when bootstrapping
-  disallowedReferences = [ build2 ];
+  disallowedReferences = [ build2-bootstrap ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace libbutl/uuid-linux.cxx \
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
   '';
 
   build2ConfigureFlags = [
-    "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
+    "config.bin.lib=${build2-bootstrap.configSharedStatic enableShared enableStatic}"
   ];
 
   doCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e57e7fac63e..8f8b8a381483 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5934,12 +5934,6 @@ with pkgs;
 
   black-macchiato = with python3Packages; toPythonApplication black-macchiato;
 
-  # Dependency of build2, must also break cycle for this
-  libbutl = callPackage ../development/libraries/libbutl {
-    build2 = build2.bootstrap;
-    inherit (darwin) DarwinTools;
-  };
-
   buildkite-test-collector-rust =
     callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust
       {