Unverified Commit df2df4c3 authored by Rafael Fernández López's avatar Rafael Fernández López
Browse files

nvidia-container-toolkit: do not shadow docker executable 

At this time, the nvidia-container-toolkit derivation installs a
docker executable that shadows the main one, and that is not thought
to forward commands to the original docker command, causing issues to
users when the `nvidia-container-toolkit` is in scope and they try to
call to `docker`.
parent 12d4ef7b

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

+9 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ buildGoModule rec { 


  };



  outputs = [ "out" "tools" ];



  vendorHash = null;



  patches = [
@@ -109,7 +111,13 @@ buildGoModule rec { 
    in

    [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ];



  postInstall = lib.optionalString (containerRuntimePath != null) ''

  postInstall = ''

    mkdir -p $tools/bin

    mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} -t $tools/bin



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

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

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

    mkdir -p $out/etc/nvidia-container-runtime



    # nvidia-container-runtime invokes docker-runc or runc if that isn't