movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 20:25:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

bumblebee: move to by-name

Browse source
This commit is contained in:
awwpotato 2025-04-18 20:30:35 -07:00
parent 820988c9b4
commit 961d9ed409
No known key found for this signature in database
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
pkgs/tools/X11/bumblebee/nixos.patch → pkgs/by-name/bu/bumblebee/nixos.patch
View file

13
pkgs/tools/X11/bumblebee/default.nix → pkgs/by-name/bu/bumblebee/package.nix
View file

@ -30,7 +30,9 @@
xorgserver, xorgserver,
kmod, kmod,
xf86videonouveau, xf86videonouveau,
nvidia_x11, nvidia_x11 ? linuxPackages.nvidia_x11,
linuxPackages,
pkgsi686Linux,
virtualgl, virtualgl,
libglvnd, libglvnd,
automake111x, automake111x,
@ -38,8 +40,13 @@
# The below should only be non-null in a x86_64 system. On a i686 # 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. # system the above nvidia_x11 and virtualgl will be the i686 packages.
# TODO: Confusing. Perhaps use "SubArch" instead of i686? # TODO: Confusing. Perhaps use "SubArch" instead of i686?
nvidia_x11_i686 ? null, nvidia_x11_i686 ?
libglvnd_i686 ? null, 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, useDisplayDevice ? false,
extraNvidiaDeviceOptions ? "", extraNvidiaDeviceOptions ? "",
extraNouveauDeviceOptions ? "", extraNouveauDeviceOptions ? "",

11
pkgs/top-level/all-packages.nix
View file

@ -16565,17 +16565,6 @@ with pkgs;
if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null; 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"; }; vlc-bin-universal = vlc-bin.override { variant = "universal"; };
libvlc = vlc.override { libvlc = vlc.override {