diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-11 12:22:34 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-11 12:22:34 -0700 |
commit | fb4000547a3930b5cae499a6931f887a7183abf3 (patch) | |
tree | df5afed387366c4441927f287d59ae1b3b4313c3 /pkgs | |
parent | 520958d8910470636677c7152cdb0da940da9e79 (diff) | |
parent | caf43ad5af9dc9936f38b2cc4d22c0d224dc5e5d (diff) | |
download | nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar.gz nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar.bz2 nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar.lz nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar.xz nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.tar.zst nixlib-fb4000547a3930b5cae499a6931f887a7183abf3.zip |
Merge pull request #9789 from pesterhazy/fix/parallel-on-darwin
parallel: no dependency on `procps` on Darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d96ca1080d83..1d3d14d7e234 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* wrapProgram $out/bin/parallel \ - --prefix PATH : "${procps}/bin" \ + ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ --prefix PATH : "${perl}/bin" \ ''; |