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

keybase: 2.1.0 -> 2.5.0 (#44698)

Browse Source
This commit is contained in:
Cole Mickens 2018-08-22 13:57:22 -07:00 committed by xeji
parent 1f9deba020
commit 6d64024734
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,10 @@
{ stdenv, buildGoPackage, fetchFromGitHub }: { stdenv, lib, buildGoPackage, fetchFromGitHub
, AVFoundation ? null, AudioToolbox ? null, ImageIO ? null, CoreMedia ? null
, Foundation ? null, CoreGraphics ? null, MediaToolbox ? null }:
buildGoPackage rec { buildGoPackage rec {
name = "keybase-${version}"; name = "keybase-${version}";
version = "2.1.0"; version = "2.5.0";
goPackagePath = "github.com/keybase/client"; goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ]; subPackages = [ "go/keybase" ];
@ -13,9 +15,10 @@ buildGoPackage rec {
owner = "keybase"; owner = "keybase";
repo = "client"; repo = "client";
rev = "v${version}"; rev = "v${version}";
sha256 = "16izsx5944byc930i6pqsbyrp316yyy8z5xvmzj0g8rgawajdx5h"; sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];
buildFlags = [ "-tags production" ]; buildFlags = [ "-tags production" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -3407,7 +3407,14 @@ with pkgs;
kexectools = callPackage ../os-specific/linux/kexectools { }; kexectools = callPackage ../os-specific/linux/kexectools { };
keybase = callPackage ../tools/security/keybase { }; keybase = 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;
};
kbfs = callPackage ../tools/security/kbfs { }; kbfs = callPackage ../tools/security/kbfs { };