Skip to content

fix: forward nvidiaHash for nixgl.auto derivation too #175

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

fix: forward nvidiaHash for nixgl.auto derivation too #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
378c68e
fix: forward nvidiaHash for nixgl.auto derivation too
muggenhor Apr 22, 2024
12f8b90
refactor: reuse nixgl.auto when nVidia is forced
muggenhor Apr 22, 2024
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
14 changes: 6 additions & 8 deletions nixGL.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,10 @@ 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 All @@ -246,10 +249,5 @@ let
nixGLCommon nixGLIntel;
} // autoNvidia;
};
in top // (if nvidiaVersion != null then
top.nvidiaPackages {
version = nvidiaVersion;
sha256 = nvidiaHash;
}
else
{ })
in top // lib.optionalAttrs (nvidiaVersion != null)
(builtins.removeAttrs top.auto [ "nixGLDefault" ])