From 971c590ecdd8213928742d46cfdd25fc441b543a Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 20:20:51 -0700 Subject: [PATCH] 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 =