From 65be0edee53214acddf1feceafa58e8b852ba2b5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 31 Aug 2021 16:01:25 +0530 Subject: [PATCH] git-branchless: add support for Darwin builds --- .../git-and-tools/git-branchless/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index c80db8ee9582..ba4b12bd4501 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -2,9 +2,13 @@ , coreutils , git +, libiconv , ncurses , rustPlatform , sqlite +, stdenv +, Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -33,6 +37,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses sqlite + ] ++ lib.optionals (stdenv.isDarwin) [ + Security + SystemConfiguration + libiconv ]; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 730fa1f35f4a..721b3ddeb353 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5255,7 +5255,9 @@ with pkgs; git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; - git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { }; + git-branchless = callPackage ../applications/version-management/git-and-tools/git-branchless { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; inherit (haskellPackages) git-brunch;