From d18524d5ace2897ad4bf68d6fe097c818575afe7 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 6 Sep 2024 19:44:48 +0200 Subject: [PATCH] Nix: Add dev shell for building using vcpkg --- flake.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 487bf197..d670ea76 100644 --- a/flake.nix +++ b/flake.nix @@ -65,8 +65,27 @@ apps.default = flake-utils.lib.mkApp { drv = self.packages.${system}.default; }; - devShells.default = pkgs.mkShell { - inputsFrom = [ self.packages.${system}.default ]; + devShells = { + default = pkgs.mkShell { + inputsFrom = [ self.packages.${system}.default ]; + }; + + # Shell for building static melonDS release builds with vcpkg + # Use mkShellNoCC to ensure Nix's gcc/clang and stdlib isn't used + vcpkg = pkgs.mkShellNoCC { + packages = with pkgs; [ + autoconf + autoconf-archive + automake + cmake + cups.dev # Needed by qtbase despite not enabling print support + git + iconv.dev + libtool + ninja + pkg-config + ]; + }; }; } );