From a9ed1dc140ce0fe6b13fb5f1929fbe0b3ffee79d Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Fri, 7 Jun 2024 22:59:59 +0200
Subject: [PATCH] nchat: 3.67 -> 5.2.11, move to by-name, add
 luftmensch-luftmensch to maintainers

Modifications done for the version change:
1. Update to the latest version
2. Fix aarch64-darwin build
3. Fix library import
---
 .../instant-messengers/nchat/default.nix      | 45 -----------
 pkgs/by-name/nc/nchat/package.nix             | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 74 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/nchat/default.nix
 create mode 100644 pkgs/by-name/nc/nchat/package.nix

diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix
deleted file mode 100644
index b9183b2d7645..000000000000
--- a/pkgs/applications/networking/instant-messengers/nchat/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, stdenv,  fetchFromGitHub, cmake, gperf
-, file, ncurses, openssl, readline, sqlite, zlib
-, AppKit, Cocoa, Foundation
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nchat";
-  version = "3.67";
-
-  src = fetchFromGitHub {
-    owner = "d99kris";
-    repo = "nchat";
-    rev = "v${version}";
-    hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI=";
-  };
-
-  postPatch = ''
-    substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \
-      --replace "get_git_head_revision" "#get_git_head_revision"
-  '';
-
-  nativeBuildInputs = [ cmake gperf ];
-
-  buildInputs = [
-    file # for libmagic
-    ncurses
-    openssl
-    readline
-    sqlite
-    zlib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ];
-
-  cmakeFlags = [
-    "-DHAS_WHATSAPP=OFF" # go module build required
-  ];
-
-  meta = with lib; {
-    description = "Terminal-based chat client with support for Telegram and WhatsApp";
-    mainProgram = "nchat";
-    homepage = "https://github.com/d99kris/nchat";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
new file mode 100644
index 000000000000..df72bce1cb02
--- /dev/null
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  fetchFromGitHub,
+  file, # for libmagic
+  ncurses,
+  openssl,
+  readline,
+  sqlite,
+  zlib,
+  cmake,
+  gperf,
+  stdenv,
+  darwin,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nchat";
+  version = "5.2.11";
+
+  src = fetchFromGitHub {
+    owner = "d99kris";
+    repo = "nchat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LcTVftLKlzHstSaJjdtqoEmQ7kiqft9dbXRXoYjbaus=";
+  };
+
+  postPatch = ''
+    substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \
+      --replace "get_git_head_revision" "#get_git_head_revision"
+    substituteInPlace lib/tgchat/CMakeLists.txt \
+      --replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    gperf
+  ];
+
+  buildInputs =
+    [
+      file # for libmagic
+      ncurses
+      openssl
+      readline
+      sqlite
+      zlib
+    ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        AppKit
+        Cocoa
+        Foundation
+      ]
+    );
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DHAS_WHATSAPP=OFF" # go module build required
+  ];
+
+  meta = {
+    description = "Terminal-based chat client with support for Telegram and WhatsApp";
+    changelog = "https://github.com/d99kris/nchat/releases/tag/v${version}";
+    homepage = "https://github.com/d99kris/nchat";
+    license = lib.licenses.mit;
+    mainProgram = "nchat";
+    maintainers = with lib.maintainers; [
+      luftmensch-luftmensch
+      sikmir
+    ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12aace53e661..600ed996351d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31800,10 +31800,6 @@ with pkgs;
 
   ngt = callPackage ../development/libraries/ngt { };
 
-  nchat = callPackage ../applications/networking/instant-messengers/nchat {
-    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
-  };
-
   nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };
 
   notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };