Merge pull request #222 from xDarksome/nix-dev-shell

nix: setup dev shell

flake.nix

@@ -3,9 +3,16 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
     parts.url = "github:hercules-ci/flake-parts";
+    parts.inputs.nixpkgs-lib.follows = "nixpkgs";
+
     crane.url = "github:ipetkov/crane";
+    crane.inputs.nixpkgs.follows = "nixpkgs";
+
     rust.url = "github:oxalica/rust-overlay";
+    rust.inputs.nixpkgs.follows = "nixpkgs";
+
     nix-filter.url = "github:numtide/nix-filter";
   };
 
@@ -68,9 +75,11 @@
           checks.cosmic-comp = cosmic-comp;
           packages.default = cosmic-comp;
 
-          devShells.default = pkgs.mkShell {
-            # Should there be packages here or use Nix purely for CI?
+          devShells.default = craneLib.devShell {
             LD_LIBRARY_PATH = lib.makeLibraryPath (__concatMap (d: d.runtimeDependencies) (__attrValues self'.checks));
+
+            # include build inputs
+            inputsFrom = [cosmic-comp];
           };
         };
     };

src/backend/winit.rs

@@ -149,8 +149,8 @@ pub fn init_backend(
     state: &mut State,
 ) -> Result<()> {
     let (mut backend, mut input) =
-        winit::init().map_err(|_| anyhow!("Failed to initilize winit backend"))?;
-    init_shaders(backend.renderer()).expect("Failed to initialize renderer");
+        winit::init().map_err(|e| anyhow!("Failed to initilize winit backend: {e:?}"))?;
+    init_shaders(backend.renderer()).context("Failed to initialize renderer")?;
 
     init_egl_client_side(dh, state, &mut backend)?;
 

src/backend/x11.rs

@@ -356,14 +356,14 @@ pub fn init_backend(
     let mut renderer =
         unsafe { GlowRenderer::new(context) }.with_context(|| "Failed to initialize renderer")?;
 
-    init_shaders(&mut renderer).expect("Failed to initialize renderer");
+    init_shaders(&mut renderer).context("Failed to initialize renderer")?;
     init_egl_client_side(dh, state, &drm_node, &mut renderer)?;
 
     state.backend = BackendData::X11(X11State {
         handle,
         allocator: try_vulkan_allocator(&drm_node)
             .or_else(|| try_gbm_allocator(fd))
-            .expect("Failed to create allocator for x11"),
+            .context("Failed to create allocator for x11")?,
         _egl: egl,
         renderer,
         surfaces: Vec::new(),