From 447ccad362e8d3c93b81b3a6da3ac4f0c0431a1e Mon Sep 17 00:00:00 2001 From: Val Packett Date: Fri, 9 Jan 2026 06:55:11 -0300 Subject: [PATCH] nix: devShell: add packages for proxy development --- devShells/default.nix | 52 +++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/devShells/default.nix b/devShells/default.nix index 7648228..382eb7b 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -1,17 +1,45 @@ -{ mkShell, lib, systemd, cargo, rust-analyzer, rustfmt, passt, bubblewrap, libkrun, muvm, sidebus-broker }: +{ + mkShell, + lib, + systemd, + cargo, + rust-analyzer, + rustfmt, + passt, + bubblewrap, + libkrun, + muvm, + sidebus-broker, + pkgs, +}: let - projects = [ libkrun muvm ]; -in mkShell { + projects = [ + libkrun + muvm + ]; +in +mkShell { MUVM_UDEVD_PATH = "${systemd}/lib/systemd/systemd-udevd"; nativeBuildInputs = lib.concatMap (pkg: pkg.nativeBuildInputs) projects; - buildInputs = (lib.concatMap (pkg: pkg.buildInputs) projects) ++ [ - # virglrenderer - cargo - rust-analyzer - rustfmt - passt - bubblewrap - sidebus-broker - ]; + buildInputs = + (lib.concatMap (pkg: pkg.buildInputs) projects) + ++ [ + # virglrenderer + cargo + rust-analyzer + rustfmt + passt + bubblewrap + sidebus-broker + ] + ++ (with pkgs; [ + meson + wayland + wayland-protocols + wayland-scanner + cairo + libgbm + ]); + # Enough things to compile wl-cross-domain-proxy, muvm, etc. in development }