diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-20 11:15:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 11:15:00 +0200 |
| commit | 4f86a5bfdd46ca790f1ecdbc5dc71f206e8a0154 (patch) | |
| tree | f6a16b8b15d6ec3c43ad86dbb6c2278d75a0d0e1 /pkgs/shells | |
| parent | ed7ea7882dd2ace66145d04066ac1f51b9e7ba5e (diff) | |
| parent | efc838b196c7bc7222d2a1046827947638f28d72 (diff) | |
Merge pull request #130465 from AumyF/nushell-features-extra
nushell: use --features=extra by default
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 65ed6d5000c2..b7fa5453d87a 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 |