nvidia-docker: split out libnvidia-container into separate drv

+10 -7
pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch
-5
pkgs/applications/virtualization/nvidia-docker/default.nix
··· 13 }: 14 15 with lib; let 16 - libnvidia-container = callPackage ./libnvc.nix { }; 17 isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ 18 { 19 name = "runc"; ··· 74 cp nvidia-docker bin 75 substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} 76 77 - cp ${libnvidia-container}/bin/nvidia-container-cli bin 78 cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin 79 cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin 80 ''; ··· 82 installPhase = '' 83 mkdir -p $out/{bin,etc} 84 cp -r bin $out 85 - 86 - wrapProgram $out/bin/nvidia-container-cli \ 87 - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib 88 89 # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH 90 wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath}
··· 13 }: 14 15 with lib; let 16 isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ 17 { 18 name = "runc"; ··· 73 cp nvidia-docker bin 74 substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} 75 76 cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin 77 cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin 78 ''; ··· 80 installPhase = '' 81 mkdir -p $out/{bin,etc} 82 cp -r bin $out 83 84 # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH 85 wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath}
pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch
+10 -2
pkgs/applications/virtualization/nvidia-docker/libnvc.nix pkgs/applications/virtualization/libnvidia-container/default.nix
··· 7 , libseccomp 8 , rpcsvc-proto 9 , libtirpc 10 }: 11 let 12 modp-ver = "450.57"; ··· 23 24 src = fetchFromGitHub { 25 owner = "NVIDIA"; 26 - repo = "libnvidia-container"; 27 rev = "v${version}"; 28 sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; 29 }; ··· 64 popd 65 ''; 66 67 NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; 68 NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; 69 70 - nativeBuildInputs = [ pkgconfig rpcsvc-proto ]; 71 72 buildInputs = [ libelf libcap libseccomp libtirpc ]; 73 ··· 76 description = "NVIDIA container runtime library"; 77 license = licenses.bsd3; 78 platforms = platforms.linux; 79 }; 80 }
··· 7 , libseccomp 8 , rpcsvc-proto 9 , libtirpc 10 + , makeWrapper 11 + 12 }: 13 let 14 modp-ver = "450.57"; ··· 25 26 src = fetchFromGitHub { 27 owner = "NVIDIA"; 28 + repo = pname; 29 rev = "v${version}"; 30 sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; 31 }; ··· 66 popd 67 ''; 68 69 + postInstall = '' 70 + wrapProgram $out/bin/nvidia-container-cli \ 71 + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib 72 + ''; 73 + 74 NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; 75 NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; 76 77 + nativeBuildInputs = [ pkgconfig rpcsvc-proto makeWrapper ]; 78 79 buildInputs = [ libelf libcap libseccomp libtirpc ]; 80 ··· 83 description = "NVIDIA container runtime library"; 84 license = licenses.bsd3; 85 platforms = platforms.linux; 86 + maintainers = with maintainers; [ cpcloud ]; 87 }; 88 }
pkgs/applications/virtualization/nvidia-docker/modprobe.patch pkgs/applications/virtualization/libnvidia-container/modprobe.patch