From df4befae64979ca87545e0829ce388ca487f7f56 Mon Sep 17 00:00:00 2001
From: stubbfelnewpc <stubbfelnewpc@stubbe.rocks>
Date: Wed, 8 Jul 2020 00:09:40 +0200
Subject: [PATCH] update start_ide and fix clean thread

---
 .nixide/start-ide.nix    | 12 ++++++++----
 server/podman/src/lib.rs |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.nixide/start-ide.nix b/.nixide/start-ide.nix
index e26da5d..08e4413 100644
--- a/.nixide/start-ide.nix
+++ b/.nixide/start-ide.nix
@@ -25,10 +25,14 @@ let
     pkgs.gccStdenv
     pkgs.binutils
     pkgs.gnupg
+    pkgs.cacert
   ];
 
+  moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
+  nightly_rust_pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
+
   projectDependencies = [
-    pkgs.rustc
+    nightly_rust_pkgs.latest.rustChannels.nightly.rust
     pkgs.rls
     pkgs.cargo
     pkgs.clippy
@@ -76,7 +80,7 @@ let
       "@theia/workspace" = "latest";
      };
      theiaPlugins = {
-        vscode-builtin-json = "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix";   
+        vscode-builtin-json = "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix";
         vscode-json-language-features = "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix";
         vscode-builtin-markdown = "https://open-vsx.org/api/vscode/markdown/1.46.1/file/vscode.markdown-1.46.1.vsix";
         vscode-builtin-markdown-language-features = "https://open-vsx.org/api/vscode/markdown-language-features/1.46.1/file/vscode.markdown-language-features-1.46.1.vsix";
@@ -84,14 +88,13 @@ let
         vscode-builtin-shellscript = "https://open-vsx.org/api/vscode/shellscript/1.46.1/file/vscode.shellscript-1.46.1.vsix";
         vscode-builtin-xml = "https://open-vsx.org/api/vscode/xml/1.46.1/file/vscode.xml-1.46.1.vsix";
         vscode-builtin-yaml = "https://open-vsx.org/api/vscode/yaml/1.46.1/file/vscode.yaml-1.46.1.vsix";
-        vscode-editorconfig = "https://open-vsx.org/api/EditorConfig/EditorConfig/0.15.1/file/EditorConfig.EditorConfig-0.15.1.vsix";    
+        vscode-editorconfig = "https://open-vsx.org/api/EditorConfig/EditorConfig/0.15.1/file/EditorConfig.EditorConfig-0.15.1.vsix";
         vscode-githistory = "https://open-vsx.org/api/donjayamanne/githistory/0.6.6/file/donjayamanne.githistory-0.6.6.vsix";
         vscode-gitlens = "https://open-vsx.org/api/eamodio/gitlens/10.2.1/file/eamodio.gitlens-10.2.1.vsix";
         vscode-shellcheck= "https://open-vsx.org/api/timonwong/shellcheck/0.9.0/file/timonwong.shellcheck-0.9.0.vsix";
         vscode-rust = "https://open-vsx.org/api/vscode/rust/1.46.1/file/vscode.rust-1.46.1.vsix";
         formulahendry-code-runner = "https://open-vsx.org/api/formulahendry/code-runner/0.10.0/file/formulahendry.code-runner-0.10.0.vsix";
         rust-lang-rust = "https://open-vsx.org/api/rust-lang/rust/0.7.8/file/rust-lang.rust-0.7.8.vsix";
-      #  swellaby-vscode-rust-test-adapter = "https://open-vsx.org/api/Swellaby/vscode-rust-test-adapter/0.11.0/file/Swellaby.vscode-rust-test-adapter-0.11.0.vsix";
         serayuzgur-crates = "https://open-vsx.org/api/serayuzgur/crates/0.5.0/file/serayuzgur.crates-0.5.0.vsix";
         belfz-search-crates-io = "https://open-vsx.org/api/belfz/search-crates-io/1.2.1/file/belfz.search-crates-io-1.2.1.vsix";
      };
@@ -182,5 +185,6 @@ pkgs.mkShell {
     export PROJECT_FOLDER=$(realpath ${projectFolder})
     export WORKING_FOLDER=$(realpath ${workingFolder})
   '';
+  LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
 }
 
diff --git a/server/podman/src/lib.rs b/server/podman/src/lib.rs
index 9c49e91..f686009 100644
--- a/server/podman/src/lib.rs
+++ b/server/podman/src/lib.rs
@@ -257,7 +257,7 @@ fn clean_thread(thread_param: &ThreadRunningParam) {
         .unwrap_or_default();
     eng.save().unwrap_or_default();
     // todo delete container
-    fs::remove_dir_all(eng.working_folder).unwrap_or_default();
+    fs::remove_dir_all(&thread_param.ide_folder).unwrap_or_default();
 }
 
 fn working_thread(thread_param: &ThreadRunningParam) -> Result<(), Error> {