Unverified Commit 24917d46 authored by Vladimir Panteleev's avatar Vladimir Panteleev
Browse files

john: disable unfree code by default 

Introduce enableUnfree option which controls whether the non-free
UnRAR code is included.

Update meta.license accordingly.
parent a62c4219

pkgs/tools/security/john/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
  withOpenCL ? true,

  opencl-headers,

  ocl-icd,

  # include non-free ClamAV unrar code

  enableUnfree ? false,

  substituteAll,

  makeWrapper,

}:
@@ -64,7 +66,7 @@ stdenv.mkDerivation rec { 
  configureFlags = [

    "--disable-native-tests"

    "--with-systemwide"

  ];

  ] ++ lib.optionals (!enableUnfree) [ "--without-unrar" ];



  buildInputs =

    [
@@ -131,7 +133,7 @@ stdenv.mkDerivation rec { 


  meta = with lib; {

    description = "John the Ripper password cracker";

    license = licenses.gpl2Plus;

    license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ];

    homepage = "https://github.com/openwall/john/";

    maintainers = with maintainers; [

      offline