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

gitui: fix darwin build (#103194)

Browse Source 
Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
This commit is contained in:
Andrew Childs 2020-11-11 00:13:52 +09:00 committed by GitHub
parent e43b443121
commit 4e2a217211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -198,7 +198,7 @@ let
gitstatus = callPackage ./gitstatus { }; gitstatus = callPackage ./gitstatus { };
gitui = callPackage ./gitui { gitui = callPackage ./gitui {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security AppKit;
}; };
grv = callPackage ./grv { }; grv = callPackage ./grv { };

4
pkgs/applications/version-management/git-and-tools/gitui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }: { stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitui"; pname = "gitui";
version = "0.10.1"; version = "0.10.1";
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ python3 ]; nativeBuildInputs = [ python3 ];
buildInputs = [ ] buildInputs = [ ]
++ stdenv.lib.optional stdenv.isLinux xorg.libxcb ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Blazing fast terminal-ui for git written in rust"; description = "Blazing fast terminal-ui for git written in rust";