Mercurial > forks > helix

changeset 5796:71b7c392ceee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
in flake mkShell default RUSTFLAGS to an empty string if unset (#10880)
author Asger Juul Brunsh?j <plul@users.noreply.github.com>
date Mon, 10 Jun 2024 17:08:39 +0200
parents 5d854645898c
children 6151661ff5aa
files flake.nix
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/flake.nix	Mon Jun 10 08:07:43 2024 -0700
+++ b/flake.nix	Mon Jun 10 17:08:39 2024 +0200
@@ -114,10 +114,7 @@
         if pkgs.stdenv.isLinux
         then pkgs.stdenv
         else pkgs.clangStdenv;
-      rustFlagsEnv =
-        if stdenv.isLinux
-        then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
-        else "$RUSTFLAGS";
+      rustFlagsEnv = pkgs.lib.optionalString stdenv.isLinux "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment";
       rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
       craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
       craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
@@ -183,7 +180,7 @@
         shellHook = ''
           export HELIX_RUNTIME="$PWD/runtime"
           export RUST_BACKTRACE="1"
-          export RUSTFLAGS="${rustFlagsEnv}"
+          export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}"
         '';
       };
     })