From ea0796129485751a9d6d7700b74a9c249786d4fc Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 28 Feb 2017 05:52:25 -0600 Subject: [PATCH] gitflow: tweak for darwin On Darwin, wrap the git-flow binary and set: FLAGS_GETOPT_CMD=${getopt}/bin/getopt Without this change, I was getting the following error: flags:ERROR short flag required for (showcommands) on this platform --- .../git-and-tools/gitflow/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 3d411a18324..a6ac1958385 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ pkgs, stdenv, fetchFromGitHub }: + +with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; @@ -12,10 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; }; + buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ]; + preBuild = '' makeFlagsArray+=(prefix="$out") ''; + postInstall = optional (stdenv.isDarwin) '' + wrapProgram $out/bin/git-flow \ + --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt + ''; + meta = with stdenv.lib; { homepage = https://github.com/petervanderdoes/gitflow; description = "Extend git with the Gitflow branching model";