From 77b33b7a852e1d6652ee685624f5b9143f521ed9 Mon Sep 17 00:00:00 2001 From: Ed L Date: Thu, 2 Apr 2026 15:58:28 -0700 Subject: [PATCH] refactor: further cleanup of linux build --- flake.nix | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index c94f495..9f1a4b3 100644 --- a/flake.nix +++ b/flake.nix @@ -43,26 +43,15 @@ pkgs = pkgs; }; in { - devShells.default = pkgs.mkShell ({ - nativeBuildInputs = - [ - rustToolchain - pkgs.pkg-config - pkgs.rust-analyzer - crate2nix.packages.${system}.default - ] - ++ pkgs.lib.optionals isLinux [ - pkgs.gcc - pkgs.pkgsMusl.stdenv.cc - ]; - - RUST_BACKTRACE = "1"; - } - // pkgs.lib.optionalAttrs isLinux { - CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "${pkgs.gcc}/bin/gcc"; - CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER = "${pkgs.pkgsMusl.stdenv.cc}/bin/cc"; - CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; - }); + devShells.default = pkgs.mkShell { + nativeBuildInputs = [ + rustToolchain + pkgs.pkg-config + pkgs.rust-analyzer + crate2nix.packages.${system}.default + ]; + RUST_BACKTRACE = "1"; + }; packages.default = cargoNix.rootCrate.build; });