Unverified Commit 5c6ed98a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #215782 from wegank/nushell-darwin 

nushell: fix build on x86_64-darwin
parents fa2bddd8 51f387be

pkgs/shells/nushell/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
, xorg

, libiconv

, AppKit

, Foundation

, Security

# darwin.apple_sdk.sdk

, sdk
@@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec { 
  buildInputs = [ openssl zstd ]

    ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]

    ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [

    Foundation

    (

      # 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

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -26231,8 +26231,8 @@ with pkgs; 














  nsh = callPackage ../shells/nsh { };



























  nushell = callPackage ../shells/nushell {













    inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security;













  nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell {













    inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security;















    inherit (darwin.apple_sdk) sdk;















  };