diff options
| author | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2017-05-06 09:05:23 +0300 |
|---|---|---|
| committer | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2017-05-06 09:33:27 +0300 |
| commit | dee8865d03ad78f7beb8e8a7f990f1ec64de199d (patch) | |
| tree | f9c01cb394d31879c559db95e2e088abc17b0721 /pkgs/applications/version-management | |
| parent | 399216c03ae37661331521aeaa7cfa7bb09519f0 (diff) | |
| download | nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar.gz nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar.bz2 nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar.lz nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar.xz nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.tar.zst nixlib-dee8865d03ad78f7beb8e8a7f990f1ec64de199d.zip | |
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.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitflow/default.nix | 7 |
1 files 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 a6ac19583858..05659a68a522 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; { |