diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-10-19 10:27:36 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-10-19 10:31:49 +0200 |
| commit | 58a36edd205fcb38959fdc6fa896a3f4d629e162 (patch) | |
| tree | 57bcd66763a93d2df34792d3670229c931110936 /pkgs/tools/security | |
| parent | f90009cbd7cb8f75e0d9d56dc12eea14b4b175a1 (diff) | |
| download | nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar.gz nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar.bz2 nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar.lz nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar.xz nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.tar.zst nixlib-58a36edd205fcb38959fdc6fa896a3f4d629e162.zip | |
monkeysphere: Replace a hardcoded path and fix more tests
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/monkeysphere/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
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 ''; |