From 3cabab85865aa1f9d6a409e55c03f9edd06269d5 Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Sat, 20 Nov 2021 09:42:45 +0100
Subject: [PATCH 1/3] fprintd-tod: fix the build

---
 pkgs/tools/security/fprintd/tod.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  4 +---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/security/fprintd/tod.nix

diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix
new file mode 100644
index 000000000000..126699572ab3
--- /dev/null
+++ b/pkgs/tools/security/fprintd/tod.nix
@@ -0,0 +1,23 @@
+{ fetchFromGitLab
+, fprintd
+, libfprint-tod
+}:
+
+fprintd.overrideAttrs (oldAttrs:
+  let
+    pname = "fprintd-tod";
+    version = "1.90.9";
+
+    libfprint = libfprint-tod;
+  in
+  {
+    inherit pname version libfprint;
+
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "libfprint";
+      repo = "${oldAttrs.pname}";
+      rev = "v${version}";
+      sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
+    };
+  })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60762177c3e9..fc8289480537 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5307,9 +5307,7 @@ with pkgs;
 
   fprintd = callPackage ../tools/security/fprintd { };
 
-  fprintd-tod = callPackage ../tools/security/fprintd {
-    libfprint = libfprint-tod;
-  };
+  fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };
 
   ferdi = callPackage ../applications/networking/instant-messengers/ferdi {
     mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };

From 1b2f4e09b675c71e11d1ddbe1f4451925ab070f8 Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com>
Date: Sat, 20 Nov 2021 12:05:14 +0100
Subject: [PATCH 2/3] Update pkgs/tools/security/fprintd/tod.nix

Co-authored-by: Alexander Bantyev <balsoft@balsoft.ru>
---
 pkgs/tools/security/fprintd/tod.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix
index 126699572ab3..157560bec524 100644
--- a/pkgs/tools/security/fprintd/tod.nix
+++ b/pkgs/tools/security/fprintd/tod.nix
@@ -3,15 +3,13 @@
 , libfprint-tod
 }:
 
-fprintd.overrideAttrs (oldAttrs:
+(fprintd.override { libfprint = libfprintd-tod; }).overrideAttrs (oldAttrs:
   let
     pname = "fprintd-tod";
     version = "1.90.9";
-
-    libfprint = libfprint-tod;
   in
   {
-    inherit pname version libfprint;
+    inherit pname version;
 
     src = fetchFromGitLab {
       domain = "gitlab.freedesktop.org";

From 5efc4fbb0c3c01334fd42d238cca18555ab95c5a Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Sat, 20 Nov 2021 12:08:45 +0100
Subject: [PATCH 3/3] fprintd-tod: fix the build

---
 pkgs/tools/security/fprintd/tod.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix
index 157560bec524..4900124f8d19 100644
--- a/pkgs/tools/security/fprintd/tod.nix
+++ b/pkgs/tools/security/fprintd/tod.nix
@@ -3,7 +3,7 @@
 , libfprint-tod
 }:
 
-(fprintd.override { libfprint = libfprintd-tod; }).overrideAttrs (oldAttrs:
+(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs:
   let
     pname = "fprintd-tod";
     version = "1.90.9";