diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix')
-rw-r--r-- | nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix b/nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix index 5e837fa36b5e..4f40b7f01dc2 100644 --- a/nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/nixpkgs/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -1,7 +1,7 @@ { # General callPackage-supplied arguments - autoAddOpenGLRunpathHook, - autoAddCudaCompatRunpathHook, + autoAddDriverRunpath, + autoAddCudaCompatRunpath, autoPatchelfHook, backendStdenv, fetchurl, @@ -193,16 +193,16 @@ backendStdenv.mkDerivation ( # in typically /lib/opengl-driver by adding that # directory to the rpath of all ELF binaries. # Check e.g. with `patchelf --print-rpath path/to/my/binary - autoAddOpenGLRunpathHook + autoAddDriverRunpath markForCudatoolkitRootHook ] - # autoAddCudaCompatRunpathHook depends on cuda_compat and would cause + # autoAddCudaCompatRunpath depends on cuda_compat and would cause # infinite recursion if applied to `cuda_compat` itself (beside the fact # that it doesn't make sense in the first place) ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [ - # autoAddCudaCompatRunpathHook must appear AFTER autoAddOpenGLRunpathHook. + # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath. # See its documentation in ./setup-hooks/extension.nix. - autoAddCudaCompatRunpathHook + autoAddCudaCompatRunpath ]; buildInputs = |