diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix
index a87423c713079..cc3bbc30342d4 100644
--- a/.devops/nix/package.nix
+++ b/.devops/nix/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  autoAddDriverRunpath,
   glibc,
   config,
   stdenv,
@@ -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
diff --git a/flake.nix b/flake.nix
index c69637d111784..a5617d37a19e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -162,7 +162,7 @@
                 cuda = config.legacyPackages.llamaPackagesCuda.llama-cpp;
 
                 mpi-cpu = config.packages.default.override { useMpi = true; };
-                mpi-cuda = config.packages.default.override { useMpi = true; };
+                mpi-cuda = config.packages.cuda.override { useMpi = true; };
               }
               // lib.optionalAttrs (system == "x86_64-linux") {
                 rocm = config.legacyPackages.llamaPackagesRocm.llama-cpp;