From 4121c5064aea6a9a755a767f3ac4288e997498a8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 29 Aug 2015 10:49:00 -0700 Subject: [PATCH] parallel: Fix some needed dependencies --- pkgs/tools/misc/parallel/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4a3b90f56d8..d96ca1080d8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { name = "parallel-20150822"; @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; }; - patchPhase = '' - sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' - ''; + nativeBuildInputs = [ makeWrapper ]; - # The `sem' program wants to write to `~/.parallel'. - preBuild = '' - export HOME="$PWD" + preFixup = '' + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* + + wrapProgram $out/bin/parallel \ + --prefix PATH : "${procps}/bin" \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true;