diff --git a/flake.nix b/flake.nix index 1db30c047..d63d1a270 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ lib.mapAttrs (system: pkgs: { default = let commonRustFlagsEnv = "-C link-arg=-fuse-ld=lld -C target-cpu=native --cfg tokio_unstable"; - platformRustFlagsEnv = lib.optionalString pkgs.stdenv.isLinux "-Clink-arg=-Wl,--no-rosegment"; + platformRustFlagsEnv = lib.optionalString pkgs.stdenv.hostPlatform.isLinux "-Clink-arg=-Wl,--no-rosegment"; in pkgs.mkShell { inputsFrom = [ @@ -75,8 +75,8 @@ rust-bin.nightly.latest.rust-analyzer mdbook ] - ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin) - ++ (lib.optional stdenv.isLinux lldb); + ++ (lib.optional (stdenv.isx86_64 && stdenv.hostPlatform.isLinux) cargo-tarpaulin) + ++ (lib.optional stdenv.hostPlatform.isLinux lldb); shellHook = '' export RUST_BACKTRACE="1" export RUSTFLAGS="''${RUSTFLAGS:-""} ${commonRustFlagsEnv} ${platformRustFlagsEnv}" diff --git a/grammars.nix b/grammars.nix index 818dcdf86..cac0e5182 100644 --- a/grammars.nix +++ b/grammars.nix @@ -98,7 +98,7 @@ ''; # Strip failed on darwin: strip: error: symbols referenced by indirect symbol table entries that can't be stripped - fixupPhase = lib.optionalString stdenv.isLinux '' + fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux '' runHook preFixup $STRIP $out/$SHARED_LIB runHook postFixup