From a931f7082426fc727bb2169ed93b2dee1da762a5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 8 May 2021 09:53:04 +0900 Subject: nushell: fix darwin build --- pkgs/shells/nushell/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/shells') diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 98a73e1acd388..24cb26324473e 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,7 +34,7 @@ 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"; -- cgit 1.4.1 From 4d8dd0afd2d5a35acb5e34c5c7b1674b74173d87 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 10 May 2021 09:45:56 +0900 Subject: nushell: mark tests broken on darwin --- pkgs/shells/nushell/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/shells') diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 24cb26324473e..7d4b04d3c94b0 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -38,6 +38,11 @@ rustPlatform.buildRustPackage rec { 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" -- cgit 1.4.1