diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-02-16 18:41:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 18:41:37 +0100 |
| commit | ac1f5b72a9e95873d1de0233fddcb56f99884b37 (patch) | |
| tree | 646aa69fc6fb173b7df59785f5f2f7cac9df5c3b | |
| parent | ac43674f72a8384dd1000a2b1f4caa778c14a632 (diff) | |
| parent | 453840daf19a9003adfac25ba583919039a6961f (diff) | |
| download | nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar.gz nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar.bz2 nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar.lz nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar.xz nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.tar.zst nixpkgs-ac1f5b72a9e95873d1de0233fddcb56f99884b37.zip | |
Merge pull request #216662 from wegank/nushell-darwin
nushell: use newer libproc.h
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 2264f0abd89..a5f9ae2f94e 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dabd6a60a..cb6fd2f0c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26229,8 +26229,8 @@ with pkgs; nsh = callPackage ../shells/nsh { }; nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { + inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; - inherit (darwin.apple_sdk) sdk; }; nettools = if stdenv.isLinux |