suzanne.soy/nixGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle nixGLDefault with nvidiaVersionFile

Browse Source
This commit is contained in:
zimbatm 2020-04-28 16:55:38 +02:00
parent 7aa1cce7c6
commit 4c09910428
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixGL.nix
View File

@ -33,7 +33,7 @@ let
# Add an impure parameter to force the rebuild on each access. # Add an impure parameter to force the rebuild on each access.
time = builtins.currentTime; time = builtins.currentTime;
} }
"cp /proc/driver/nvidia/version $out"; "cp /proc/driver/nvidia/version $out || touch $out";
# The nvidia version. Either fixed by the `nvidiaVersion` argument, or # The nvidia version. Either fixed by the `nvidiaVersion` argument, or
# auto-detected. Auto-detection is impure. # auto-detected. Auto-detection is impure.
@ -46,8 +46,10 @@ let
data = builtins.readFile _nvidiaVersionFile; data = builtins.readFile _nvidiaVersionFile;
versionMatch = builtins.match ".*Module +([0-9]+\\.[0-9]+).*" data; versionMatch = builtins.match ".*Module +([0-9]+\\.[0-9]+).*" data;
in in
assert builtins.length versionMatch == 1; if versionMatch != null then
builtins.head versionMatch; builtins.head versionMatch
else
null;
addNvidiaVersion = drv: drv.overrideAttrs(oldAttrs: { addNvidiaVersion = drv: drv.overrideAttrs(oldAttrs: {
name = oldAttrs.name + "-${_nvidiaVersion}"; name = oldAttrs.name + "-${_nvidiaVersion}";
@ -187,8 +189,9 @@ in
# The output derivation contains nixGL which point either to # The output derivation contains nixGL which point either to
# nixGLNvidia or nixGLIntel using an heuristic. # nixGLNvidia or nixGLIntel using an heuristic.
nixGLDefault = nixGLDefault =
if builtins.pathExists "/proc/driver/nvidia/version" if _nvidiaVersion != null then
then nixGLCommon nixGLNvidia nixGLCommon nixGLNvidia
else nixGLCommon nixGLIntel; else
nixGLCommon nixGLIntel
} ;
}