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

keybase: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 19:52:00 +02:00
parent 956c197ee6
commit 41d1294eab
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/security/keybase/default.nix
View File

@ -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; {

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

@ -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