From 378be0a5429ddcc85b3e818d8631d7ddeb302d8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Feb 2020 21:15:10 -0500 Subject: [PATCH] gitAndTools.git-interactive-rebase-tool: enable on darwin --- .../version-management/git-and-tools/default.nix | 4 +++- .../git-and-tools/git-interactive-rebase-tool/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3a68f7903822..3682717f314d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -103,7 +103,9 @@ let git-imerge = callPackage ./git-imerge { }; - git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {}; + git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; git-machete = python3Packages.callPackage ./git-machete { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index cb6a15ef6906..7635a96eca5e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, ncurses5, fetchFromGitHub, rustPlatform }: +{ stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; - buildInputs = [ ncurses5 ]; + buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "--test-threads=1" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}";