Merge pull request #327030 from Tochiaha/ophcrack-gui

ophcrack-cli: refactor to use ophcrack

pkgs/by-name/op/ophcrack-cli/package.nix

@@ -1,73 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, autoreconfHook
-, libtool
-, zlib
-, pkg-config
-, openssl
-, freetype
-, expat
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ophcrack";
-  version = "3.8.0";
-
-  src = fetchurl {
-    url = "https://sourceforge.net/projects/ophcrack/files/ophcrack/3.8.0/ophcrack-3.8.0.tar.bz2";
-    hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    libtool
-    expat
-  ];
-
-  buildInputs = [
-    zlib
-    openssl
-    freetype
-    pkg-config
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/c60118b40802e1162dcebfe5f881cf973b2334d3/debian/patches/fix_spelling_error.diff";
-      hash = "sha256-Fc044hTU4Mtdym+HukGAwGzaLm7aVzV9KpvHvFUG2Sc=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/e19d993a7dbf131d13128366e2aac270a685befc/debian/patches/qmake_crossbuild.diff";
-      hash = "sha256-sOKXOBpAYGLacU6IxjRzy3HCnGm4DFowDL2qP+DzG8M=";
-    })
-  ];
-
-  configureFlags = [
-    "--with-libssl=yes"
-    "--disable-gui"
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    make
-
-    runHook postBuild
-  '';
-
-  postInstall = ''
-    mv $out/bin/ophcrack $out/bin/ophcrack-cli
-  '';
-
-  meta = with lib; {
-    description = "Free Windows password cracker based on rainbow tables";
-    homepage = "https://ophcrack.sourceforge.io";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ tochiaha ];
-    mainProgram = "ophcrack-cli";
-    platforms = platforms.all;
-  };
-}
-

pkgs/by-name/op/ophcrack/package.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  libsForQt5,
+  fetchurl,
+  fetchpatch,
+  pkg-config,
+  openssl,
+  expat,
+  enableGui ? true,
+}:
+stdenv.mkDerivation rec {
+
+  pname = "ophcrack";
+  version = "3.8.0";
+
+  src = fetchurl {
+    url = "mirror://ophcrack/ophcrack/${version}/ophcrack-${version}.tar.bz2";
+    hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/c60118b40802e1162dcebfe5f881cf973b2334d3/debian/patches/fix_spelling_error.diff";
+      hash = "sha256-Fc044hTU4Mtdym+HukGAwGzaLm7aVzV9KpvHvFUG2Sc=";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/e19d993a7dbf131d13128366e2aac270a685befc/debian/patches/qmake_crossbuild.diff";
+      hash = "sha256-sOKXOBpAYGLacU6IxjRzy3HCnGm4DFowDL2qP+DzG8M=";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
+  buildInputs =
+    [ openssl ]
+    ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) ++ lib.optional stdenv.isDarwin expat;
+
+  configureFlags =
+    [ "--with-libssl" ]
+    ++ (
+      if enableGui then
+        [
+          "--enable-gui"
+          "--with-qt5charts"
+        ]
+      else
+        [ "--disable-gui" ]
+    );
+
+  installPhase = lib.optional stdenv.isDarwin ''
+    mkdir -p $out/bin
+    cp -R src/ophcrack $out/bin
+  '';
+
+  meta = {
+    description = "Free Windows password cracker based on rainbow tables";
+    homepage = "https://ophcrack.sourceforge.io";
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [ tochiaha ];
+    mainProgram = "ophcrack";
+    platforms = lib.platforms.all;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -11009,6 +11009,8 @@ with pkgs;
 
   openfec = callPackage ../development/libraries/openfec { };
 
+  ophcrack-cli = ophcrack.override { enableGui = false; };
+
   ophis = python3Packages.callPackage ../development/compilers/ophis { };
 
   open-ecard = callPackage ../tools/security/open-ecard { };