BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #215782 from wegank/nushell-darwin

Browse source 
nushell: fix build on x86_64-darwin
This commit is contained in:
Weijia Wang 2023-02-11 10:01:24 +01:00 committed by GitHub
commit 5c6ed98a1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/shells/nushell/default.nix
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -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;
};