JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #159937 from happysalada/starship_fix_darwin

Browse Source
This commit is contained in:
Ben Siraphob 2022-02-14 12:08:44 -06:00 committed by GitHub
commit d4b0e04852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/misc/starship/default.nix
View File

@ -8,6 +8,7 @@
, libiconv , libiconv
, nixosTests , nixosTests
, Security , Security
, Foundation
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ] buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ]; ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ];
postInstall = '' postInstall = ''
for shell in bash fish zsh; do for shell in bash fish zsh; do

2
pkgs/top-level/all-packages.nix
View File

@ -24029,7 +24029,7 @@ with pkgs;
stdmanpages = callPackage ../data/documentation/std-man-pages { }; stdmanpages = callPackage ../data/documentation/std-man-pages { };
starship = callPackage ../tools/misc/starship { starship = callPackage ../tools/misc/starship {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security Foundation;
}; };
stig = callPackage ../applications/networking/p2p/stig { }; stig = callPackage ../applications/networking/p2p/stig { };