diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..c65f719
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,58 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        llvmPkgs = pkgs.llvmPackages_19;
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          name = "mesa-crocus-opencl";
+
+          packages = with pkgs; [
+            # build tools
+            meson
+            ninja
+            pkg-config
+            cmake
+            python3
+            python3Packages.packaging
+
+            # LLVM stack
+            llvmPkgs.llvm.dev
+            llvmPkgs.clang
+            llvmPkgs.libclc
+
+            # Rust
+            rust-bindgen
+            rustc
+            cargo
+
+            # Mesa deps
+            libdrm
+            expat
+            zlib
+            zstd
+            glslang
+            libffi
+            elfutils
+          ];
+
+          shellHook = ''
+            export PKG_CONFIG_PATH=${pkgs.llvmPackages_19.libclc}/share/pkgconfig:$PKG_CONFIG_PATH
+          '';
+        };
+      }
+    );
+}
diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c
index cf287b0..6c7022a 100644
--- a/src/gallium/drivers/crocus/crocus_screen.c
+++ b/src/gallium/drivers/crocus/crocus_screen.c
@@ -482,6 +482,15 @@ static void
 crocus_query_memory_info(struct pipe_screen *pscreen,
                          struct pipe_memory_info *info)
 {
+   struct crocus_screen *screen = (struct crocus_screen *) pscreen;
+
+   const uint64_t total_kb =
+      (uint64_t)screen->base.caps.video_memory * 1024;
+
+   info->total_device_memory  = 0;
+   info->avail_device_memory  = 0;
+   info->total_staging_memory = (uint32_t)MIN2(total_kb, UINT32_MAX);
+   info->avail_staging_memory = info->total_staging_memory;
 }
 
 static int
diff --git a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
index a5fd731..96962ee 100644
--- a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
+++ b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs
@@ -503,7 +503,13 @@ impl PipeScreen {
         &self,
         shader: mesa_shader_stage,
     ) -> *const nir_shader_compiler_options {
-        self.screen().nir_options[shader as usize]
+        let ptr = self.screen().nir_options[shader as usize];
+        assert!(
+            !ptr.is_null(),
+            "nir_options[{:?}] is null — driver compute NIR options set edilmemiş",
+            shader
+      );
+      ptr
     }
 
     pub fn shader_cache(&self) -> Option<DiskCacheBorrowed> {