From 73ec7f243f42185c1a6efb526c0c9d3d3732d6c4 Mon Sep 17 00:00:00 2001
From: j-keck <jhyphenkeck@gmail.com>
Date: Tue, 3 Feb 2015 11:11:17 +0100
Subject: libcap_progs: fix bash path

  * in progs/capsh.c is the bash path hardcoded to '/bin/bash'.
  * this fix removes the absolute path und use 'execvpe' to call 'bash'.
---
 pkgs/os-specific/linux/libcap/progs.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix
index 9b2a8b69c3c..ae4446c82e6 100644
--- a/pkgs/os-specific/linux/libcap/progs.nix
+++ b/pkgs/os-specific/linux/libcap/progs.nix
@@ -10,8 +10,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ libcap ];
 
   prePatch = ''
-    BASH=$(type -tp bash)
-    substituteInPlace progs/capsh.c --replace "/bin/bash" "$BASH"
+    # use relative bash path
+    substituteInPlace progs/capsh.c --replace "/bin/bash" "bash"
+
+    # ensure capsh can find bash in $PATH
+    substituteInPlace progs/capsh.c --replace execve execvpe
   '';
 
   preConfigure = "cd progs";
-- 
cgit 1.4.1