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

Merge pull request #312711 from eliandoran/darwin/sdk_11

Browse Source 
treewide: fix build errors on darwin due to incorrect SDK
This commit is contained in:
Weijia Wang 2024-05-19 00:43:35 +02:00 committed by GitHub
commit be54494b2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/ji/jikken/package.nix
View File

@ -26,9 +26,9 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ openssl ]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.IOKit
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
darwin.apple_sdk_11_0.frameworks.IOKit
darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.frameworks.SystemConfiguration
];
passthru.updateScript = nix-update-script { };

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

@ -2334,7 +2334,7 @@ with pkgs;
git-credential-1password = callPackage ../applications/version-management/git-credential-1password { };
git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc {
git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
};
@ -11187,7 +11187,7 @@ with pkgs;
nylon = callPackage ../tools/networking/nylon { };
nym = callPackage ../applications/networking/nym {
nym = darwin.apple_sdk_11_0.callPackage ../applications/networking/nym {
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
@ -40258,7 +40258,7 @@ with pkgs;
vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
veilid = callPackage ../tools/networking/veilid {
veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};