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

+41 -19
+41
pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
···
··· 1 + { lib 2 + , fetchFromGitHub 3 + , buildGoModule 4 + , callPackage 5 + , makeWrapper 6 + , containerRuntimePath 7 + , configTemplate 8 + }: 9 + let 10 + nvidia-container-runtime = callPackage ../nvidia-container-runtime { 11 + inherit containerRuntimePath configTemplate; 12 + }; 13 + in 14 + buildGoModule rec { 15 + pname = "nvidia-container-toolkit"; 16 + version = "1.3.0"; 17 + src = fetchFromGitHub { 18 + owner = "NVIDIA"; 19 + repo = pname; 20 + rev = "v${version}"; 21 + sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; 22 + }; 23 + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; 24 + buildFlagsArray = [ "-ldflags=" "-s -w" ]; 25 + nativeBuildInputs = [ makeWrapper ]; 26 + postInstall = '' 27 + mv $out/bin/{pkg,${pname}} 28 + ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} 29 + 30 + wrapProgram $out/bin/nvidia-container-toolkit \ 31 + --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml" 32 + ''; 33 + 34 + meta = with lib; { 35 + homepage = "https://github.com/NVIDIA/nvidia-container-toolkit"; 36 + description = "NVIDIA container runtime hook"; 37 + license = licenses.bsd3; 38 + platforms = platforms.linux; 39 + maintainers = with maintainers; [ cpcloud ]; 40 + }; 41 + }
-19
pkgs/applications/virtualization/nvidia-docker/default.nix
··· 12 }: 13 14 with lib; let 15 - nvidia-container-toolkit = buildGoModule rec { 16 - pname = "nvidia-container-toolkit"; 17 - version = "1.3.0"; 18 - src = fetchFromGitHub { 19 - owner = "NVIDIA"; 20 - repo = "nvidia-container-toolkit"; 21 - rev = "v${version}"; 22 - sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; 23 - }; 24 - vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; 25 - buildFlagsArray = [ "-ldflags=" "-s -w" ]; 26 - postInstall = '' 27 - mv $out/bin/{pkg,${pname}} 28 - cp $out/bin/{${pname},nvidia-container-runtime-hook} 29 - ''; 30 - }; 31 - 32 in 33 stdenv.mkDerivation rec { 34 pname = "nvidia-docker"; ··· 46 47 cp nvidia-docker bin 48 substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} 49 - 50 - cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin 51 ''; 52 53 installPhase = ''
··· 12 }: 13 14 with lib; let 15 in 16 stdenv.mkDerivation rec { 17 pname = "nvidia-docker"; ··· 29 30 cp nvidia-docker bin 31 substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} 32 ''; 33 34 installPhase = ''