From 71ff774a443706a2699c53335b26edfb7f1d29a7 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Thu, 2 May 2024 08:06:30 -0400 Subject: [PATCH] Ensure we use correct LLVM in nix dev shell --- flake.nix | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 720fac91..0da4eb9a 100644 --- a/flake.nix +++ b/flake.nix @@ -30,20 +30,25 @@ default = conky; }; - apps.conky = flake-utils.lib.mkApp {drv = packages.conky;}; - apps.default = apps.conky; - devShells.default = mkShell { - buildInputs = - packages.conky.buildInputs - ++ packages.conky.nativeBuildInputs - ++ [ - alejandra # for beautifying flake - lefthook # for git hooks - nodejs # for web/ stuff - # for docs - (python3.withPackages (ps: with ps; [jinja2])) - ]; + apps.conky = flake-utils.lib.mkApp { + drv = packages.conky; }; + apps.default = apps.conky; + devShells.default = + mkShell.override { + stdenv = llvmPackages_18.libcxxStdenv; + } rec { + buildInputs = + packages.conky.buildInputs + ++ packages.conky.nativeBuildInputs + ++ [ + alejandra # for beautifying flake + lefthook # for git hooks + nodejs # for web/ stuff + # for docs + (python3.withPackages (ps: with ps; [jinja2])) + ]; + }; } ) // {