From efc838b196c7bc7222d2a1046827947638f28d72 Mon Sep 17 00:00:00 2001 From: Aumy <46275902+AumyF@users.noreply.github.com> Date: Sun, 18 Jul 2021 00:36:31 +0900 Subject: [PATCH] nushell: use --features=extra by default --- pkgs/shells/nushell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 65ed6d5000c..b7fa5453d87 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -12,7 +12,7 @@ , Security , nghttp2 , libgit2 -, withStableFeatures ? true +, withExtraFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths