From a28a3f573247696f7cf55ee5f2a141ad854a2108 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 29 Aug 2025 19:33:56 -0400 Subject: [PATCH] default.nix: carve-outs for osx --- default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 3ff2a2b7..3748a5a3 100644 --- a/default.nix +++ b/default.nix @@ -206,6 +206,8 @@ pkgs.mkShell { # buildInputs = [ + pkgs.nix + pkgs.gsettings-desktop-schemas pkgs.emacs pkgs.nushell @@ -225,7 +227,7 @@ pkgs.mkShell { pkgs.python3Packages.sphinx-rtd-theme #pkgs.python3Packages.sphinx-autobuild # needs patch for typeguard; defer for now pkgs.python3Packages.breathe - pkgs.python3Packages.sphinxcontrib-ditaa + #pkgs.python3Packages.sphinxcontrib-ditaa pkgs.python3Packages.sphinxcontrib-plantuml pkgs.python3Packages.pillow @@ -257,7 +259,7 @@ pkgs.mkShell { pkgs.cmake pkgs.pkg-config - pkgs.emscripten +# pkgs.emscripten pkgs.imgui pkgs.SDL2.dev pkgs.glew @@ -265,8 +267,9 @@ pkgs.mkShell { # pkgs.nixGL.nixGLNvidia # pkgs.nixGL.nixGLMesa pkgs.libGL - pkgs.stdenv.cc.cc.lib - pkgs.glibc +# pkgs.stdenv.cc.cc.lib +# pkgs.glibc + # try vulkan instead of opengl (at least on OSX) pkgs.vulkan-loader pkgs.vulkan-headers @@ -274,7 +277,7 @@ pkgs.mkShell { pkgs.darwin.moltenvk # fonts for imgui - pkgs.gucharmap +# pkgs.gucharmap pkgs.fontconfig pkgs.noto-fonts #pkgs.noto-fonts-lgc # lgc for latin,greek,cyrillic (but doesn't exist in pinned nixpkgs)