diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/by-name/pr/primus/package.nix
similarity index 85%
rename from pkgs/tools/X11/primus/default.nix
rename to pkgs/by-name/pr/primus/package.nix
index 1f4964e3aa3a..cb1a886ea962 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/by-name/pr/primus/package.nix
@@ -5,19 +5,20 @@
 # Other distributions do the same.
 {
   stdenv,
-  stdenv_i686,
+  pkgsi686Linux,
   lib,
   primusLib,
   writeScriptBin,
   runtimeShell,
-  primusLib_i686 ? null,
+  primusLib_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null,
   useNvidia ? true,
 }:
 
 let
   # We override stdenv in case we need different ABI for libGL
   primusLib_ = primusLib.override { inherit stdenv; };
-  primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; };
+  primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; };
 
   primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
   primus_i686 =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46ddd84a8ea4..b5285681fbd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16545,12 +16545,6 @@ with pkgs;
       if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null;
   };
 
-  primus = callPackage ../tools/X11/primus {
-    stdenv_i686 = pkgsi686Linux.stdenv;
-    primusLib_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null;
-  };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {