Skip to content

Add some driver version-selection logic #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add some driver version-selection logic #184

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
267a634
add sopme driver version-selection logic
ulucs Oct 15, 2024
f22be0e
remove trace
ulucs Oct 15, 2024
117c673
add comments
ulucs Oct 15, 2024
93b5496
improve error message
ulucs Oct 15, 2024
c59a6a2
use the builtin lexical comparison
ulucs Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions nixGL.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enable32bits ? stdenv.hostPlatform.isx86
, zlib, libdrm, xorg, wayland, gcc, zstd }:

let
toAvailableVersion = import ./nvidiaVersions.nix { inherit lib; };
writeExecutable = { name, text }:
writeTextFile {
inherit name text;
Expand Down Expand Up @@ -67,15 +68,17 @@ let
It contains the builder for different nvidia configuration, parametrized by
the version of the driver and sha256 sum of the driver installer file.
*/
nvidiaPackages = { version, sha256 ? null }: rec {
nvidiaPackages = { version, sha256 ? null, strict ? false }:
let matchedVersion = if strict then version else toAvailableVersion version;
in rec {
nvidiaDrivers = (linuxPackages.nvidia_x11.override { }).overrideAttrs
(oldAttrs: rec {
pname = "nvidia";
name = "nvidia-x11-${version}-nixGL";
inherit version;
name = "nvidia-x11-${matchedVersion}-nixGL";
version = matchedVersion;
src = let
url =
"https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}.run";
"https://download.nvidia.com/XFree86/Linux-x86_64/${matchedVersion}/NVIDIA-Linux-x86_64-${matchedVersion}.run";
in if sha256 != null then
fetchurl { inherit url sha256; }
else
Expand All @@ -90,7 +93,7 @@ let
};

nixGLNvidiaBumblebee = writeExecutable {
name = "nixGLNvidiaBumblebee-${version}";
name = "nixGLNvidiaBumblebee-${matchedVersion}";
text = ''
#!${runtimeShell}
export LD_LIBRARY_PATH=${
Expand All @@ -114,7 +117,7 @@ let
# TODO: 32bit version? Not tested.
nixNvidiaWrapper = api:
writeExecutable {
name = "nix${api}Nvidia-${version}";
name = "nix${api}Nvidia-${matchedVersion}";
text = ''
#!${runtimeShell}
${lib.optionalString (api == "Vulkan")
Expand Down
Loading