From e7e04fa56982cf80a57bd938625d1c84813afaa2 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 11 Feb 2025 14:18:54 -0500
Subject: [PATCH] feat(pam-grosshack): use latest release instead of latest git

---
 apps/update-sources/src/app.ts            |  5 +++
 flake.lock                                | 17 --------
 flake.nix                                 |  6 ---
 inputs/default.nix                        |  5 ---
 packages/pam-fprint-grosshack/default.nix | 51 +++++++++++++++++------
 packages/proton-ge-latest/default.nix     | 16 +++----
 6 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/apps/update-sources/src/app.ts b/apps/update-sources/src/app.ts
index 4067699e..9a7ca0bc 100644
--- a/apps/update-sources/src/app.ts
+++ b/apps/update-sources/src/app.ts
@@ -67,6 +67,10 @@ const main = async() => {
         console.log(await updateNodeModules());
     }
 
+    if (args['p'] || args['pam-fprint-grosshack']) {
+        console.log(runNixUpdate('pam-fprint-grosshack'));
+    }
+
     if (args['s'] || args['some-sass-language-server']) {
         console.log(updateCustomPackage('some-sass-language-server'));
     }
@@ -129,6 +133,7 @@ const main = async() => {
 
         updatePackage('homepage');
         updatePackage('jmusicbot');
+        updatePackage('pam-fprint-grosshack');
 
 
         spawnSync('nixFastBuild', [], {
diff --git a/flake.lock b/flake.lock
index a59dc68b..4161cf2d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1517,22 +1517,6 @@
         "type": "github"
       }
     },
-    "pam-fprint-grosshack-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1658952526,
-        "narHash": "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=",
-        "owner": "mishakmak",
-        "repo": "pam-fprint-grosshack",
-        "rev": "45b42524fb5783e1e555067743d7e0f70d27888a",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "mishakmak",
-        "repo": "pam-fprint-grosshack",
-        "type": "gitlab"
-      }
-    },
     "pcsd": {
       "inputs": {
         "nixpkgs": [
@@ -1736,7 +1720,6 @@
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nurl": "nurl",
         "nvim-theme-src": "nvim-theme-src",
-        "pam-fprint-grosshack-src": "pam-fprint-grosshack-src",
         "pcsd": "pcsd",
         "piper-src": "piper-src",
         "poetry2nix": "poetry2nix",
diff --git a/flake.nix b/flake.nix
index 48661553..baaf5b19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -381,12 +381,6 @@
       repo = "dracula.nvim";
       type = "github";
     };
-    pam-fprint-grosshack-src = {
-      flake = false;
-      owner = "mishakmak";
-      repo = "pam-fprint-grosshack";
-      type = "gitlab";
-    };
     pcsd = {
       inputs = {
         nixpkgs.follows = "nixpkgs";
diff --git a/inputs/default.nix b/inputs/default.nix
index 646dae36..417e92db 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -340,11 +340,6 @@ let
       owner = "rogs";
       repo = "subscleaner";
     }
-    {
-      type = "gitlab";
-      owner = "mishakmak";
-      repo = "pam-fprint-grosshack";
-    }
     {
       type = "gitlab";
       owner = "phoneybadger";
diff --git a/packages/pam-fprint-grosshack/default.nix b/packages/pam-fprint-grosshack/default.nix
index bebd6608..f476f093 100644
--- a/packages/pam-fprint-grosshack/default.nix
+++ b/packages/pam-fprint-grosshack/default.nix
@@ -2,43 +2,68 @@
   # nix build inputs
   lib,
   stdenv,
-  pam-fprint-grosshack-src,
+  fetchFromGitLab,
   # deps
   dbus,
   glib,
   libfprint,
   libpam-wrapper,
+  libxml2,
+  libxslt,
   meson,
   ninja,
   pam,
+  perl,
   pkg-config,
   polkit,
+  python3Packages,
   systemd,
   ...
 }: let
-  inherit (builtins) elemAt head readFile split;
-  tag = head (split "'" (elemAt (split " version: '" (readFile "${pam-fprint-grosshack-src}/meson.build")) 2));
+  pname = "pam-fprint-grosshack";
+  version = "0.3.0";
 in
   stdenv.mkDerivation {
-    pname = "pam-fprint-grosshack";
-    version = "${tag}+${pam-fprint-grosshack-src.shortRev}";
+    inherit pname version;
 
-    src = pam-fprint-grosshack-src;
+    src = fetchFromGitLab {
+      owner = "mishakmak";
+      repo = "pam-fprint-grosshack";
+      rev = "v${version}";
+      hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
+    };
+
+    # Tests aren't actually ran for some reason so I get rid of the warning
+    postPatch = ''
+      substituteInPlace ./meson.build --replace-fail \
+          "'gi.repository.FPrint': true," "'gi.repository.FPrint': false,"
+    '';
 
     nativeBuildInputs = [
-      meson
-      ninja
-      pkg-config
+      dbus
       glib
       libfprint
-      polkit
-      dbus
-      systemd
-      pam
       libpam-wrapper
+      libxml2
+      libxslt
+      meson
+      ninja
+      pam
+      perl
+      pkg-config
+      polkit
+      systemd
+
+      python3Packages.python
+      python3Packages.dbus-python
+      python3Packages.pydbus
+      python3Packages.pypamtest
+      python3Packages.python-dbusmock
     ];
 
     mesonFlags = [
+      "-Dgtk_doc=true"
+      "-Dman=true"
       "-Dpam_modules_dir=${placeholder "out"}/lib/security"
       "-Dsysconfdir=${placeholder "out"}/etc"
       "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services"
diff --git a/packages/proton-ge-latest/default.nix b/packages/proton-ge-latest/default.nix
index f676b7cc..8087abd5 100644
--- a/packages/proton-ge-latest/default.nix
+++ b/packages/proton-ge-latest/default.nix
@@ -30,11 +30,13 @@ in
         runHook postBuild
       '';
 
-    meta = o.meta // {
-      description = ''
-        ${o.meta.description}
-        This derivation overrides the Proton version in Steam so that games using the Proton
-        from nix keep using it after every version change.
-      '';
-    };
+    meta =
+      o.meta
+      // {
+        description = ''
+          ${o.meta.description}
+          This derivation overrides the Proton version in Steam so that games using the Proton
+          from nix keep using it after every version change.
+        '';
+      };
   })