diff --git a/.nix/shell.nix b/.nix/shell.nix
index eb62db9..a2f5ee2 100644
--- a/.nix/shell.nix
+++ b/.nix/shell.nix
@@ -1,8 +1,9 @@
-with import <nixpkgs> {};
+  with import <nixpkgs> {};
 
-stdenv.mkDerivation {
+{ pkgs ? import <nixpkgs> {} }:
+  pkgs.mkShell {
 	name = "forstio";
-	buildInputs = [ scons gnutls clang_12 clang-tools];
+	nativeBuildInputs = [ scons gnutls clang_12 clang-tools];
 
 	buildPhase = ''
 	'';
diff --git a/SConstruct b/SConstruct
index 93b4635..5a9b7a9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -81,6 +81,7 @@ format_iter(env,env.sources + env.driver_sources + env.headers + env.driver_head
 env.Alias('format', env.format_actions)
 
 env.Alias('all', ['format', 'library', 'test'])
+env.Default('all')
 
 env.Install('$prefix/lib/', [env.library_shared, env.library_static])
 env.Install('$prefix/include/forstio/', [env.headers])