From 9f3daab64f0d9ef5c47ffbd1e16eea968a8d9d61 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 7 May 2023 20:30:36 +0200
Subject: [PATCH] lnd: fix cert key format bug

---
 pkgs/default.nix     |  5 +++++
 pkgs/lnd/default.nix | 12 ++++++++++++
 pkgs/pinned.nix      |  1 -
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/lnd/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c57cfdc..f131f9f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,6 +22,11 @@ let self = {
   spark-wallet = pkgs.callPackage ./spark-wallet { };
   trustedcoin = pkgs.callPackage ./trustedcoin { };
 
+  # TODO-EXTERNAL:
+  # Remove this when https://github.com/lightningnetwork/lnd/pull/7672
+  # has been resolved
+  lnd = pkgsUnstable.callPackage ./lnd { };
+
   pyPkgs = import ./python-packages self pkgs.python3;
   inherit (self.pyPkgs)
     nbPython3Packages
diff --git a/pkgs/lnd/default.nix b/pkgs/lnd/default.nix
new file mode 100644
index 0000000..2e91ddc
--- /dev/null
+++ b/pkgs/lnd/default.nix
@@ -0,0 +1,12 @@
+{ lnd, fetchpatch }:
+
+lnd.overrideAttrs (_: {
+  patches = [
+    (fetchpatch {
+      # https://github.com/lightningnetwork/lnd/pull/7672
+      name = "fix-PKCS8-cert-key-support";
+      url = "https://github.com/lightningnetwork/lnd/pull/7672.patch";
+      hash = "sha256-j9EirxyNi48DGzLuHcZ36LrFlbJLXrE8L+1TYh5Yznk=";
+    })
+  ];
+})
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index f3aee8a..868d3fe 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -17,7 +17,6 @@ pkgs: pkgsUnstable:
     fulcrum
     hwi
     lightning-loop
-    lnd
     nbxplorer;
 
   inherit pkgs pkgsUnstable;