summary refs log tree commit diff
diff options
context:
space:
mode:
authorOleksii Filonenko <brightone@protonmail.com>2019-12-19 16:26:35 +0200
committerOleksii Filonenko <brightone@protonmail.com>2019-12-19 16:26:35 +0200
commit7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a (patch)
treea2ea350c5f9f29c22817a9d500f28dd16a93cfc8
parent297a5627af613d72b08842f0f201dafd6f446a6a (diff)
downloadnixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar.gz
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar.bz2
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar.lz
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar.xz
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.tar.zst
nixpkgs-7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a.zip
nushell: change --all-features to --features=stable
-rw-r--r--pkgs/shells/nushell/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 3e3080aff8c..05fef442c31 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -8,7 +8,7 @@
 , libiconv
 , AppKit
 , Security
-, withAllFeatures ? true
+, withStableFeatures ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "0bdxlbl33kilp9ai40dvdzlx9vcl8r21br82r5ljs2pg521jd66p";
 
   nativeBuildInputs = [ pkg-config ]
-    ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ];
+    ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]
-    ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ]
-    ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ];
+    ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
+    ++ stdenv.lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ];
 
-  cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features";
+  cargoBuildFlags = stdenv.lib.optional withStableFeatures "--features=stable";
 
   preCheck = ''
     export HOME=$TMPDIR