nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 02:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #316866 from NixOS/backport-316594-to-release-24.05

Browse Source 
[Backport release-24.05] cudaPackages: fix cuda alias warning
This commit is contained in:
Pol Dellaiera 2024-06-03 12:29:45 +02:00 committed by GitHub
commit 35d01638bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/cuda-modules/aliases.nix
View File

@ -13,6 +13,6 @@ in
mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
autoAddOpenGLRunpathHook =
mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpath"
mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpathHook"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
}

5
pkgs/development/cuda-modules/cuda/extension.nix
View File

@ -53,6 +53,10 @@ let
redistribRelease = redistribManifest.${pname};
featureRelease = featureManifest.${pname};
drv =
let
# get `autoAddDriverRunpath` from pkgs instead of cudaPackages' alias to avoid warning
inherit (callPackage ({ pkgs }: pkgs) { }) autoAddDriverRunpath;
in
(callPackage ../generic-builders/manifest.nix {
# We pass the whole release to the builder because it has logic to handle
# the case we're trying to build on an unsupported platform.
@ -61,6 +65,7 @@ let
redistName
redistribRelease
featureRelease
autoAddDriverRunpath
;
}).overrideAttrs
(prevAttrs: {