From 58a36edd205fcb38959fdc6fa896a3f4d629e162 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 19 Oct 2018 10:27:36 +0200
Subject: monkeysphere: Replace a hardcoded path and fix more tests

---
 pkgs/tools/security/monkeysphere/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index 228695878dcc..0cf59dc555c2 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper
 , perl, libassuan, libgcrypt
-, perlPackages, lockfileProgs, gnupg
+, perlPackages, lockfileProgs, gnupg, coreutils
 # For the tests:
 , bash, openssh, which, socat, cpio, hexdump
 }:
@@ -16,10 +16,14 @@ stdenv.mkDerivation rec {
 
   patches = [ ./monkeysphere.patch ];
 
+  postPatch = ''
+    sed -i "s,/usr/bin/env,${coreutils}/bin/env," src/share/ma/update_users
+  '';
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perl libassuan libgcrypt ]
     ++ stdenv.lib.optional doCheck
-      ([ gnupg openssh which socat cpio hexdump ] ++
+      ([ gnupg openssh which socat cpio hexdump lockfileProgs ] ++
       (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
 
   makeFlags = ''
@@ -31,10 +35,8 @@ stdenv.mkDerivation rec {
   # entropy (apparently GnuPG still uses /dev/random).
   doCheck = false;
   preCheck = ''
-    patchShebangs tests/keytrans
-    patchShebangs src/share/keytrans
-    patchShebangs src/share/checkperms
-    sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic
+    patchShebangs tests/
+    patchShebangs src/
     sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
     sed -i "s/<(hd/<(hexdump/" tests/keytrans
   '';
-- 
cgit 1.4.1