Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e43b443121b4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e2a21721133
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 10, 2020

  1. gitui: fix darwin build (#103194) 

    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)
    @thefloweringash
    thefloweringash authored Nov 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4e2a217 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/applications/version-management/git-and-tools/default.nix
  2. +2 −2 pkgs/applications/version-management/git-and-tools/gitui/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-and-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ let
gitstatus = callPackage ./gitstatus { };

gitui = callPackage ./gitui {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security AppKit;
};

grv = callPackage ./grv { };
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/gitui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }:
{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }:
rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.10.1";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ python3 ];
buildInputs = [ ]
++ 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; {
description = "Blazing fast terminal-ui for git written in rust";