Change source of forstio in default

2 files changed, 28 insertions, 8 deletions

diff --git a/default.nix b/default.nix
index 85895d6..fd26b34 100644
--- a/default.nix
+++ b/default.nix
@@ -1,14 +1,34 @@
 { pkgs ? import <nixpkgs> {}
-, stdenv ? pkgs.llvmPackages_19.stdenv
-, forstio ? (import ((builtins.fetchGit {
-    url = "git@git.keldu.de:forstio/forstio";
-    ref = "dev";
-  }).outPath + "/default.nix"){
-    inherit stdenv;
-  }).forstio
+, llvmPackages ? pkgs.llvmPackages_20
+, stdenv ? llvmPackages.stdenv
+, clang-tools ? llvmPackages.clang-tools
 }:
 
 let
+	forstio = let
+		forstioSrc = stdenv.mkDerivation {
+			name = "forstio-src";
+
+		 src = builtins.fetchurl {
+			url = "https://git.keldu.de/forstio-forstio/snapshot/master.tar.gz";
+			sha256 = "e91c18fef798dd7b3afbd1615c2e320b90d74aa2d7ef726801a76e3f7f77ae81";
+		 };
+
+		 phases = [ "unpackPhase" "installPhase" ];
+
+		 unpackPhase = ''
+			mkdir source
+			tar -xzf "$src" -C source --strip-components=1
+		 '';
+
+		 installPhase = ''
+			cp -r source $out
+		 '';
+	  };
+	in
+	(import "${forstioSrc}/default.nix" {
+		inherit stdenv clang-tools;
+	}).forstio;
 in {
 	kel_rar = pkgs.callPackage ./run_and_record/.nix/derivation.nix {
 		inherit stdenv forstio;
diff --git a/run_and_record/c++/main.cpp b/run_and_record/c++/main.cpp
index c52d5f5..c21ec9d 100644
--- a/run_and_record/c++/main.cpp
+++ b/run_and_record/c++/main.cpp
@@ -54,7 +54,7 @@ saw::error_or<void> run_program(int argc, char** argv){
 		if(WIFEXITED(status)){
 			child_exit_code = WEXITSTATUS(status);
 		}else{
-			return saw::make_error<saw::err::critical>("Program existed unexpectedly");
+			return saw::make_error<saw::err::critical>("Program exited unexpectedly");
 		}
 	}