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

Merge pull request #312711 from eliandoran/darwin/sdk_11 

treewide: fix build errors on darwin due to incorrect SDK
parents 7e1be015 bdf93b60

pkgs/by-name/ji/jikken/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 { };

pkgs/top-level/all-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;















  };