From 0c364c74c46161b9fc787a58480931d692d78453 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Mon, 13 Sep 2021 20:03:07 +0300
Subject: [PATCH] Update nheko

---
 flake.lock                           | 29 ++++++++++++++++++++++------
 flake.nix                            |  5 +++++
 machines/AMD-Workstation/default.nix |  2 +-
 profiles/overlay.nix                 | 24 ++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 65cb5d4..c9fb8c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,6 +32,22 @@
         "type": "github"
       }
     },
+    "coeurl": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1628872501,
+        "narHash": "sha256-bslkrBjAsf2co4lt9efEQ3R6YNR2+minZAKkcZKjykI=",
+        "ref": "master",
+        "rev": "22f58922da16c3b94d293d98a07cb7caa7a019e8",
+        "revCount": 51,
+        "type": "git",
+        "url": "https://nheko.im/nheko-reborn/coeurl"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://nheko.im/nheko-reborn/coeurl"
+      }
+    },
     "crate2nix": {
       "flake": false,
       "locked": {
@@ -337,11 +353,11 @@
     "mtxclient": {
       "flake": false,
       "locked": {
-        "lastModified": 1624110239,
-        "narHash": "sha256-JlTGwFZKQ0sJpOPtMPKY9wm11yDrdyNw9OKr7E4yBOQ=",
+        "lastModified": 1630632658,
+        "narHash": "sha256-onpaWKkTgwQkIZrou7VmhlLRq5dIu1yZ8R/pc00KCkc=",
         "owner": "nheko-reborn",
         "repo": "mtxclient",
-        "rev": "acfff15ca153723e41cf7ef06ff82b1c24c933ef",
+        "rev": "a4f4c79153cc139c44aaf7bd5bf47fef6c0712b3",
         "type": "github"
       },
       "original": {
@@ -374,11 +390,11 @@
     "nheko": {
       "flake": false,
       "locked": {
-        "lastModified": 1624613955,
-        "narHash": "sha256-/k/081pI0S8YHxbct1yhNqJQW4EKfu9/KsjLZ2CoQDU=",
+        "lastModified": 1631536282,
+        "narHash": "sha256-kavv/Aw38skTuL6AlhgE5pdDm/8RWl3I+sheTJFQD3A=",
         "owner": "nheko-reborn",
         "repo": "nheko",
-        "rev": "36f0e044398535143f24bbf2850df9e5b2947770",
+        "rev": "1b82b8242b1290b3ce39f932597e8cd3854b5e82",
         "type": "github"
       },
       "original": {
@@ -629,6 +645,7 @@
       "inputs": {
         "NUR": "NUR",
         "base16-black-metal-scheme": "base16-black-metal-scheme",
+        "coeurl": "coeurl",
         "crdt": "crdt",
         "deploy-rs": "deploy-rs",
         "emacs-overlay": "emacs-overlay",
diff --git a/flake.nix b/flake.nix
index 9e1b588..7c97eb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,6 +73,11 @@
       flake = false;
     };
 
+    coeurl = {
+      url = "git+https://nheko.im/nheko-reborn/coeurl";
+      flake = false;
+    };
+
     mopidy-ytmusic = {
       url = "github:OzymandiasTheGreat/mopidy-ytmusic";
       flake = false;
diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix
index 5e9b758..896c72d 100644
--- a/machines/AMD-Workstation/default.nix
+++ b/machines/AMD-Workstation/default.nix
@@ -40,7 +40,7 @@
     enable = true;
     proxy = true;
     lanSize = 32;
-    serverIP = "147.75.100.17";
+    serverIP = "95.217.152.163";
     serverPort = 35944;
     serverKey = "sgLUARawWJejANs2CwuCptwJO55c4jkmnP0L14FNCyw=";
     privateKeyFile = config.secrets.wireguard-wg0.decrypted;
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
index 359388a..aceb9f0 100644
--- a/profiles/overlay.nix
+++ b/profiles/overlay.nix
@@ -142,12 +142,34 @@ in {
 
       nix-direnv = inputs.nix-direnv.defaultPackage.${system};
 
-      mtxclient = super.mtxclient.overrideAttrs (_: {
+      coeurl = self.stdenv.mkDerivation {
+        name = "coeurl";
+        src = inputs.coeurl;
+        buildInputs = [ self.curl.all self.libevent self.spdlog ];
+        nativeBuildInputs = [ self.meson self.ninja self.pkg-config self.cmake ];
+      };
+
+      mtxclient = super.mtxclient.overrideAttrs (oa: {
         src = inputs.mtxclient;
+        cmakeFlags = oa.cmakeFlags ++ [ "-DCMAKE_CXX_FLAGS=-DSPDLOG_FMT_EXTERNAL" ];
+        buildInputs = oa.buildInputs ++ [ self.libevent self.curl.all self.coeurl self.spdlog.dev ];
       });
 
       nheko = (super.nheko.overrideAttrs (oa: {
         src = inputs.nheko;
+        postPatch = ''
+          substituteInPlace CMakeLists.txt --replace "# Fixup bundled keychain include dirs" "find_package(Boost COMPONENTS iostreams system  thread REQUIRED)"
+        '';
+        buildInputs = oa.buildInputs ++ [
+          self.xorg.libXdmcp
+          self.pcre
+          self.libunwind
+          self.elfutils
+          self.coeurl
+          self.curl
+          self.libevent
+        ];
+        cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
       })).override { mtxclient = self.mtxclient; };
     })
   ];