diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-12 12:27:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 12:27:04 +0000 |
| commit | 1d2db664643ea78f1987bf4ec5e3f8521a4d6cab (patch) | |
| tree | 7012e693b6ee301653e706b521758273698a32bf /pkgs/shells | |
| parent | 717884806406da949074c4c1f4c80f6a1e3f0231 (diff) | |
| parent | 79eb39fed91a655d9fda9876b1f1412d4c0c5208 (diff) | |
| download | nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar.gz nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar.bz2 nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar.lz nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar.xz nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.tar.zst nixpkgs-1d2db664643ea78f1987bf4ec5e3f8521a4d6cab.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 98a73e1acd3..7d4b04d3c94 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -10,6 +10,8 @@ , libiconv , AppKit , Security +, nghttp2 +, libgit2 , withStableFeatures ? true }: @@ -32,10 +34,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; + ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + # TODO investigate why tests are broken on darwin + # failures show that tests try to write to paths + # outside of TMPDIR + doCheck = ! stdenv.isDarwin; + checkPhase = '' runHook preCheck echo "Running cargo test" |