diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/by-name/bu/bumblebee/nixos.patch
similarity index 100%
rename from pkgs/tools/X11/bumblebee/nixos.patch
rename to pkgs/by-name/bu/bumblebee/nixos.patch
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/by-name/bu/bumblebee/package.nix
similarity index 93%
rename from pkgs/tools/X11/bumblebee/default.nix
rename to pkgs/by-name/bu/bumblebee/package.nix
index 50c9209288e1..cfffcec882f6 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -30,7 +30,9 @@
   xorgserver,
   kmod,
   xf86videonouveau,
-  nvidia_x11,
+  nvidia_x11 ? linuxPackages.nvidia_x11,
+  linuxPackages,
+  pkgsi686Linux,
   virtualgl,
   libglvnd,
   automake111x,
@@ -38,8 +40,13 @@
   # The below should only be non-null in a x86_64 system. On a i686
   # system the above nvidia_x11 and virtualgl will be the i686 packages.
   # TODO: Confusing. Perhaps use "SubArch" instead of i686?
-  nvidia_x11_i686 ? null,
-  libglvnd_i686 ? null,
+  nvidia_x11_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then
+      pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
+    else
+      null,
+  libglvnd_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null,
   useDisplayDevice ? false,
   extraNvidiaDeviceOptions ? "",
   extraNouveauDeviceOptions ? "",
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b83ccb7c4..ac0a6dd942da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16565,17 +16565,6 @@ with pkgs;
       if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null;
   };
 
-  bumblebee = callPackage ../tools/X11/bumblebee {
-    nvidia_x11 = linuxPackages.nvidia_x11;
-    nvidia_x11_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then
-        pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
-      else
-        null;
-    libglvnd_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null;
-  };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {