From 9981e5be60640ede89f7a0999f6d59b5eacc8809 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sun, 2 Jun 2024 11:56:27 +0800 Subject: [PATCH 1/2] cudaPackages: fix an alias typo --- pkgs/development/cuda-modules/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 36dd07d773bd..7f28f2c76d47 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -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 } From ae5074ef871e2c249b2421272d7959d59c8a5e6d Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sun, 2 Jun 2024 11:58:57 +0800 Subject: [PATCH 2/2] cudaPackages: fix an annoying warning caused by alias --- pkgs/development/cuda-modules/cuda/extension.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix index 5b87a3df0959..f39171e88874 100644 --- a/pkgs/development/cuda-modules/cuda/extension.nix +++ b/pkgs/development/cuda-modules/cuda/extension.nix @@ -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: {