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