From 9af1beeaad602a1ffa7693fcd1f5bca311ae96b8 Mon Sep 17 00:00:00 2001 From: Alec Edgington <54802828+cqc-alec@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:06:06 +0000 Subject: [PATCH] chore: Fix devenv for Linux (#206) --- devenv.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/devenv.nix b/devenv.nix index 4ffda2d6..a1dd0d15 100644 --- a/devenv.nix +++ b/devenv.nix @@ -5,11 +5,16 @@ # https://devenv.sh/packages/ # on macos frameworks have to be explicitly specified # otherwise a linker error ocurs on rust packages - packages = lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk; [ - frameworks.CoreServices - frameworks.CoreFoundation - pkgs.just - ]); + packages = [ pkgs.just ] + ++ lib.optionals pkgs.stdenv.isLinux [ + pkgs.stdenv.cc.cc.lib + ] + ++ lib.optionals pkgs.stdenv.isDarwin ( + with pkgs.darwin.apple_sdk; [ + frameworks.CoreServices + frameworks.CoreFoundation + ] + ); # Certain Rust tools won't work without this # This can also be fixed by using oxalica/rust-overlay and specifying the rust-src extension