diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-12 04:20:00 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2019-11-12 04:20:00 -0500 |
| commit | a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43 (patch) | |
| tree | 80feb96b9cb9872bee259bb1a78254d1c2b3c8c3 | |
| parent | 10246893188f6aff33a251f7febdf04a3c4e5b8b (diff) | |
| download | nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar.gz nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar.bz2 nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar.lz nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar.xz nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.tar.zst nixlib-a8942c6cbd737c4ce989caab5a5ae2a05b9a5d43.zip | |
nushell: add withAllFeatures flag
Co-authored-by: Evan Stoll <evanjs@users.noreply.github.com>
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 6e075b7ceee5..916845047740 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -3,8 +3,12 @@ , rustPlatform , openssl , pkg-config +, python3 +, xorg , libiconv +, AppKit , Security +, withAllFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -20,10 +24,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; + + cargoBuildFlags = stdenv.lib.optionals withAllFeatures [ "--features" "all" ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71910a316377..f267e3f743ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16569,7 +16569,7 @@ in musl = callPackage ../os-specific/linux/musl { }; nushell = callPackage ../shells/nushell { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) AppKit Security; }; nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } |