summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-08-18 17:55:04 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-08-18 17:55:04 +0200
commit4cf394ea3f173946363c40439b03ebcd92eb2bb4 (patch)
tree59d51185dc4aa583270396ce18fb2143a7e0fe1c /pkgs/tools/security
parent9da079c6ff5e2870485ed014fe388a5c67997535 (diff)
parent0a84375ddb9c41fb5ffa9bf9785debcec84b0614 (diff)
downloadnixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.gz
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.bz2
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.lz
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.xz
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.zst
nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/john/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index f47728b8ba2..2fedec48c70 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -48,20 +48,21 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   postInstall = ''
-    mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules"
+    mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/${perlPackages.perl.libPrefix}"
     find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \
       -exec cp -d {} "$out/bin" \;
     cp -vt "$out/etc/john" ../run/*.conf
     cp -vt "$out/share/john" ../run/*.chr ../run/password.lst
     cp -vt "$out/share/john/rules" ../run/rules/*.rule
     cp -vrt "$out/share/doc/john" ../doc/*
+    cp -vt "$out/${perlPackages.perl.libPrefix}" ../run/lib/*
   '';
 
   postFixup = ''
     wrapPythonPrograms
 
     for i in $out/bin/*.pl; do
-      wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB
+      wrapProgram "$i" --prefix PERL5LIB : "$PERL5LIB:$out/${perlPackages.perl.libPrefix}"
     done
   '';