From dee8865d03ad78f7beb8e8a7f990f1ec64de199d Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sat, 6 May 2017 09:05:23 +0300 Subject: [PATCH] gitAndTools.gitflow: fix runtime dependencies #25487 If `git-flow` was installed without explicitly installing `getopt` and `git` too, it couldn't find those executables. Now it can find those and it can be used as `git-flow` executable. Note, however, that in order to use `git-flow` as git subcommand (`git flow`), one needs to install `git` too. --- .../version-management/git-and-tools/gitflow/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 a6ac1958385..05659a68a52 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -14,15 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg"; }; - buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") ''; - postInstall = optional (stdenv.isDarwin) '' + postInstall = '' wrapProgram $out/bin/git-flow \ - --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt + --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt \ + --suffix PATH : ${pkgs.git}/bin ''; meta = with stdenv.lib; {