Skip to content

fix: only generate a version file if nvidiaVersion isn't set #130

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 1 commit into
base: main
Choose a base branch
from
Open

fix: only generate a version file if nvidiaVersion isn't set #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions nixGL.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ let
'';

auto = let
_nvidiaVersionFile = if nvidiaVersionFile != null then
_nvidiaVersionFile = if nvidiaVersionFile != null || nvidiaVersion != null then
# In the case nvidiaVersion is not null, nvidiaVersionFile is not used
# so we can set _nvidiaVersionFile == nvidiaVersionFile == null
nvidiaVersionFile
else
# HACK: Get the version from /proc. It turns out that /proc is mounted
Expand All @@ -235,7 +237,7 @@ let
versionMatch = builtins.match ".*Module ([0-9.]+) .*" data;
in if versionMatch != null then builtins.head versionMatch else null;

autoNvidia = nvidiaPackages {version = nvidiaVersionAuto; };
autoNvidia = nvidiaPackages {version = nvidiaVersionAuto; sha256 = nvidiaHash;};
in rec {
# The output derivation contains nixGL which point either to
# nixGLNvidia or nixGLIntel using an heuristic.
Expand Down