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/tools/X11/primus/lib.nix b/pkgs/by-name/pr/primusLib/package.nix
similarity index 87%
rename from pkgs/tools/X11/primus/lib.nix
rename to pkgs/by-name/pr/primusLib/package.nix
index 1beecf73015e..dfe3c58ce1fa 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/by-name/pr/primusLib/package.nix
@@ -5,7 +5,8 @@
   fetchpatch,
   libX11,
   libGL,
-  nvidia_x11 ? null,
+  linuxPackages,
+  nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; },
   libglvnd,
 }:
 
@@ -55,14 +56,14 @@ stdenv.mkDerivation {
 
   passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null;
 
-  meta = with lib; {
+  meta = {
     description = "Low-overhead client-side GPU offloading";
     homepage = "https://github.com/amonakov/primus";
     platforms = [
       "i686-linux"
       "x86_64-linux"
     ];
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a57a8925472d..e695a90ed900 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16532,16 +16532,6 @@ with pkgs;
       if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null;
   };
 
-  primusLib = callPackage ../tools/X11/primus/lib.nix {
-    nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
-  };
-
-  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 {