public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nushell: add withAllFeatures flag

Browse Source 
Co-authored-by: Evan Stoll <evanjs@users.noreply.github.com>
This commit is contained in:
Mario Rodas 2019-11-12 04:20:00 -05:00
parent 1024689318
commit a8942c6cbd
No known key found for this signature in database
GPG Key ID: 4C4BEFD7B18DC5E8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/shells/nushell/default.nix
View File

@ -3,8 +3,12 @@
, rustPlatform , rustPlatform
, openssl , openssl
, pkg-config , pkg-config
, python3
, xorg
, libiconv , libiconv
, AppKit
, Security , Security
, withAllFeatures ? true
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -20,10 +24,15 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp"; cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] 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 = '' preCheck = ''
export HOME=$TMPDIR export HOME=$TMPDIR

2
pkgs/top-level/all-packages.nix
View File

@ -16569,7 +16569,7 @@ in
musl = callPackage ../os-specific/linux/musl { }; musl = callPackage ../os-specific/linux/musl { };
nushell = callPackage ../shells/nushell { 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 { } nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }