diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-16 17:50:14 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-16 17:50:14 +0100 |
| commit | 453840daf19a9003adfac25ba583919039a6961f (patch) | |
| tree | 9d68fa6f23095abb5c0068be014821ba4b667e15 /pkgs/shells | |
| parent | cdcfb1e18e62083d4dbcc5a2fb97641c1a06d7e1 (diff) | |
nushell: use newer libproc.h
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 2264f0abd8923..a5f9ae2f94e59 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -11,10 +11,9 @@ , python3 , xorg , libiconv +, Libsystem , AppKit , Security -# darwin.apple_sdk.sdk -, sdk , nghttp2 , libgit2 , withExtraFeatures ? true @@ -44,21 +43,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - ( - # Pull a header that contains a definition of proc_pid_rusage(). - # (We pick just that one because using the other headers from `sdk` is not - # compatible with our C++ standard library. This header is already in - # the standard library on aarch64) - # See also: - # https://github.com/shanesveller/nixpkgs/tree/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/development/libraries/webkitgtk/default.nix - # https://github.com/shanesveller/nixpkgs/blob/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/tools/system/btop/default.nix#L32-L38 - runCommand "${pname}_headers" { } '' - install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h - '' - ) - ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ] + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; buildFeatures = lib.optional withExtraFeatures "extra"; |