Merge branch 'master' into staging

2019-04-05 11:37:15 +02:00
parent 79b3d1b33d 9fa17c5957
commit cb1a20499a
513 changed files with 10098 additions and 5499 deletions
@@ -45,6 +45,10 @@ stdenv.mkDerivation {
  postInstall = ''
    mkdir -p $out/share/man/man1
    cp ../docs/lldb.1 $out/share/man/man1/
+
+    install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
+    mkdir $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+    ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
  '';

  meta = with stdenv.lib; {