diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2015-11-26 11:28:17 -0500 |
|---|---|---|
| committer | Michael Alan Dorman <mdorman@ironicdesign.com> | 2015-11-26 11:28:17 -0500 |
| commit | d9b858d67ebb206b488c02d29ed9100c8dfa2c58 (patch) | |
| tree | 963a27fcc0eae4b35bdc0447a8928403e2f4791f /pkgs/tools/misc/parallel/default.nix | |
| parent | 4ce35ba61ccd52f4c8d9d1773501f66db6cea043 (diff) | |
| download | nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar.gz nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar.bz2 nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar.lz nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar.xz nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.tar.zst nixpkgs-d9b858d67ebb206b488c02d29ed9100c8dfa2c58.zip | |
Partial revert of "parallel: 20150922 -> 20151122"
This is a partial revert of commit ed2b30dc283f2ec326fe80dc5259682d1f0f4fb3. The changes outside of a new version of parallel broke several go packages.
Diffstat (limited to 'pkgs/tools/misc/parallel/default.nix')
| -rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 48d86f9a5fe..ca347cfe842 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0phn9dlkqlq3cq468ypxbbn78bsjcin743pyvf8ip4qg6jz662jm"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; preFixup = '' - patchShebangs $out/bin + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* wrapProgram $out/bin/parallel \ - ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} + ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true; |