diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-10-23 17:12:23 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-10-24 09:55:06 +0200 |
commit | 3d4e133e7724e1376ff9310b9949c4c372410c65 (patch) | |
tree | 526ee5475288d059bda99a6cb231dc1b20b33d44 /pkgs/tools/misc/parallel/default.nix | |
parent | c0a646edd027eff321054f24a2701ba13d3c889a (diff) | |
download | nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar.gz nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar.bz2 nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar.lz nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar.xz nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.tar.zst nixpkgs-3d4e133e7724e1376ff9310b9949c4c372410c65.zip |
parallel: fix calculation of max line length
parallel >= 20200822 uses /bin/echo to calculate the max allowed line length. Patch it to a correct path, so that it doesn't (silently) fail and fall back to a low value of 324. Before: $ parallel --max-line-length-allowed 324 After: $ parallel --max-line-length-allowed 131063 Fixes: 16ca8725ff ("parallel: 20200722 -> 20200822")
Diffstat (limited to 'pkgs/tools/misc/parallel/default.nix')
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index e99f2aa12d5..2f3ca5afd5a 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, makeWrapper, procps }: +{ fetchurl, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { name = "parallel-20200822"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; + patches = [ + ./fix-max-line-length-allowed.diff + ]; + + postPatch = '' + substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} + ''; + outputs = [ "out" "man" ]; nativeBuildInputs = [ makeWrapper ]; |