From 41d1294eab95d5e0406ea6bfd9c033b8d564de8c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 19 Jun 2019 19:52:00 +0200 Subject: [PATCH] keybase: remove cf-private --- pkgs/tools/security/keybase/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 02a322a1802..dc95ae706b2 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchurl, cf-private +{ stdenv, lib, buildGoPackage, fetchurl , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox }: @@ -17,11 +17,7 @@ buildGoPackage rec { sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh"; }; - buildInputs = lib.optionals stdenv.isDarwin [ - AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox - # Needed for OBJC_CLASS_$_NSData symbols. - cf-private - ]; + buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5eb41b6a05..d2aaf869efe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3970,7 +3970,6 @@ in kexpand = callPackage ../development/tools/kexpand { }; keybase = callPackage ../tools/security/keybase { - inherit (darwin) cf-private; # 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