From 92e2b47cb68508db0c2dcf122f90289941076771 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:18:28 -0700
Subject: [PATCH 1/3] primusLib: remove with lib

---
 pkgs/tools/X11/primus/lib.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix
index 1beecf73015e..a8f9761f2da9 100644
--- a/pkgs/tools/X11/primus/lib.nix
+++ b/pkgs/tools/X11/primus/lib.nix
@@ -55,14 +55,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 ];
   };
 }

From 971c590ecdd8213928742d46cfdd25fc441b543a Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:20:51 -0700
Subject: [PATCH 2/3] primusLib: move to by-name

---
 .../X11/primus/lib.nix => by-name/pr/primusLib/package.nix}   | 3 ++-
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{tools/X11/primus/lib.nix => by-name/pr/primusLib/package.nix} (94%)

diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/by-name/pr/primusLib/package.nix
similarity index 94%
rename from pkgs/tools/X11/primus/lib.nix
rename to pkgs/by-name/pr/primusLib/package.nix
index a8f9761f2da9..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,
 }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc0e13af2e01..46ddd84a8ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16545,10 +16545,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 =

From 7e6f24fe2893f6f0f412ade6df08dc92c037c323 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Fri, 18 Apr 2025 20:24:04 -0700
Subject: [PATCH 3/3] primus: move to by-name

---
 .../primus/default.nix => by-name/pr/primus/package.nix}   | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 6 ------
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename pkgs/{tools/X11/primus/default.nix => by-name/pr/primus/package.nix} (85%)

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 {