From 0fd0a5d73c27874659a6ce73be247cf9e92ec421 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Thu, 23 May 2024 15:50:41 -0700 Subject: [PATCH] switch default devshell to static linking Dynamically-linked jemalloc doesn't work due to link-order issues, and we want CI to be testing a static binary anyway since that's what we're publishing in releases. --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fc4f6a1d..08e3c954 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ inputs.flake-utils.lib.eachDefaultSystem (system: let pkgsHost = inputs.nixpkgs.legacyPackages.${system}; + pkgsHostStatic = pkgsHost.pkgsStatic; # The Rust toolchain to use toolchain = inputs.fenix.packages.${system}.fromToolchainFile { @@ -43,6 +44,7 @@ }); scopeHost = mkScope pkgsHost; + scopeHostStatic = mkScope pkgsHostStatic; mkDevShell = scope: scope.pkgs.mkShell { env = scope.main.env // { @@ -185,6 +187,6 @@ ) ); - devShells.default = mkDevShell scopeHost; + devShells.default = mkDevShell scopeHostStatic; }); }