]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
nix: fix CUDA build - replace deprecated autoAddOpenGLRunpathHook
authorEcho Nolan <redacted>
Thu, 22 Aug 2024 21:19:14 +0000 (17:19 -0400)
committerSomeone <redacted>
Sat, 31 Aug 2024 08:44:21 +0000 (08:44 +0000)
The CUDA nix build broke when we updated nixpkgs in
8cd1bcfd3fc9f2b5cbafd7fb7581b3278acec25f. As far as I can tell all
that happened is cudaPackages.autoAddOpenGLRunpathHook got moved to
pkgs.autoAddDriverRunpath. This commit fixes it.

.devops/nix/package.nix

index a87423c71307909cf88ac9ddd6178c0fa3b95970..cfffac257b75b8fe6450e10752adeab3b5caa8be 100644 (file)
@@ -13,6 +13,7 @@
   mpi,
   blas,
   cudaPackages,
+  autoAddDriverRunpath,
   darwin,
   rocmPackages,
   vulkan-headers,
@@ -192,10 +193,7 @@ effectiveStdenv.mkDerivation (
       ]
       ++ optionals useCuda [
         cudaPackages.cuda_nvcc
-
-        # TODO: Replace with autoAddDriverRunpath
-        # once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
-        cudaPackages.autoAddOpenGLRunpathHook
+        autoAddDriverRunpath
       ]
       ++ optionals (effectiveStdenv.hostPlatform.isGnu && enableStatic) [
         glibc.static