Merge pull request #316594 from wrvsrx/fix-cuda-alias-warning

cudaPackages: fix cuda alias warning
This commit is contained in:
Pol Dellaiera
2024-06-02 23:15:07 +02:00
committed by GitHub
2 changed files with 6 additions and 1 deletions
+1 -1
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
}
@@ -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: {