Unverified Commit a59b0f1d authored by Someone's avatar Someone Committed by GitHub
Browse files

nvidia-container-toolkit: minor fixups (#405919)

parents bae2d185 0a8bcd46

nixos/tests/nvidia-container-toolkit.nix

+4 −1
Original line number Diff line number Diff line
@@ -90,7 +90,10 @@ in 
{

  name = "nvidia-container-toolkit";

  meta = with lib.maintainers; {

    maintainers = [ ereslibre ];

    maintainers = [

      ereslibre

      christoph-heiss

    ];

  };

  defaults =

    { config, ... }:

pkgs/by-name/nv/nvidia-container-toolkit/package.nix

+19 −8
Original line number Diff line number Diff line
@@ -52,15 +52,19 @@ buildGoModule rec { 


  postPatch = ''

    substituteInPlace internal/config/config.go \

      --replace '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \

      --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

      --replace-fail '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \

      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'



    substituteInPlace tools/container/toolkit/toolkit.go \

      --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'



    substituteInPlace cmd/nvidia-cdi-hook/update-ldcache/update-ldcache.go \

      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

  '';



  subPackages = [

    "cmd/nvidia-cdi-hook"

    "cmd/nvidia-container-runtime"

    "cmd/nvidia-container-runtime.cdi"

    "cmd/nvidia-container-runtime-hook"

    "cmd/nvidia-container-runtime.legacy"
@@ -77,6 +81,8 @@ buildGoModule rec { 
    # "-X name=value"

    "-X"

    "${cliVersionPackage}.version=${version}"

    "-X"

    "github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=${src.rev}"

  ];



  nativeBuildInputs = [
@@ -99,11 +105,13 @@ buildGoModule rec { 


  postInstall =

    ''

      wrapProgram $out/bin/nvidia-container-runtime-hook \

        --prefix PATH : ${libnvidia-container}/bin



      mkdir -p $tools/bin

      mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin

      mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin



      for bin in nvidia-container-runtime-hook nvidia-container-runtime; do

        wrapProgram $tools/bin/$bin \

          --prefix PATH : ${libnvidia-container}/bin:$out/bin

      done

    ''

    + lib.optionalString (configTemplate != null || configTemplatePath != null) ''

      mkdir -p $out/etc/nvidia-container-runtime
@@ -119,6 +127,9 @@ buildGoModule rec { 
    description = "NVIDIA Container Toolkit";

    license = licenses.asl20;

    platforms = platforms.linux;

    maintainers = with maintainers; [ cpcloud ];

    maintainers = with maintainers; [

      cpcloud

      christoph-heiss

    ];

  };

}