From 81b354ceb05728eee931e95183f3b9d0fce77306 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 12 Jul 2023 20:44:13 -0600 Subject: [PATCH] keybase: fix build on x86_64-darwin Go is built with the 11.0 SDK, so build Keybase with the same SDK to prevent build failures due to mixed SDKs. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94608ea1f872..5550ee4d37de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9338,13 +9338,13 @@ with pkgs; kent = callPackage ../applications/science/biology/kent { }; - keybase = callPackage ../tools/security/keybase { + keybase = darwin.apple_sdk_11_0.callPackage ../tools/security/keybase { # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { };