Merge branch 'master' into staging-next

zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
parent 5c072a088d 9414948a5a
commit e6c0c98940
64 changed files with 1092 additions and 930 deletions
@@ -62,7 +62,10 @@ stdenv.mkDerivation rec {

  buildPhase = ''
    mkdir bin
+
    cp nvidia-docker bin
+    substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version}
+
    cp ${libnvidia-container}/bin/nvidia-container-cli bin
    cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
    cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin