From 4312e5a93c75524c8f8bfe57eb74bbb25f5aaab8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 14 Sep 2024 15:10:18 +0200
Subject: [PATCH] nheko: move to by-name and reformat

---
 .../nh/nheko/package.nix}                     | 118 +++++++++---------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 59 insertions(+), 61 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/nheko/default.nix => by-name/nh/nheko/package.nix} (51%)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/by-name/nh/nheko/package.nix
similarity index 51%
rename from pkgs/applications/networking/instant-messengers/nheko/default.nix
rename to pkgs/by-name/nh/nheko/package.nix
index b60d68f2bc12..2e1bf3126d75 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -1,32 +1,27 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, asciidoc
-, pkg-config
-, boost179
-, cmark
-, coeurl
-, curl
-, kdsingleapplication
-, libevent
-, libsecret
-, lmdb
-, lmdbxx
-, mtxclient
-, nlohmann_json
-, olm
-, qtbase
-, qtimageformats
-, qtkeychain
-, qtmultimedia
-, qttools
-, qtwayland
-, re2
-, spdlog
-, wrapQtAppsHook
-, gst_all_1
-, libnice
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  asciidoc,
+  pkg-config,
+  boost179,
+  cmark,
+  coeurl,
+  curl,
+  kdsingleapplication,
+  libevent,
+  libsecret,
+  lmdb,
+  lmdbxx,
+  mtxclient,
+  nlohmann_json,
+  olm,
+  re2,
+  spdlog,
+  gst_all_1,
+  libnice,
+  qt6Packages,
 }:
 
 stdenv.mkDerivation rec {
@@ -45,37 +40,38 @@ stdenv.mkDerivation rec {
     cmake
     lmdbxx
     pkg-config
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    boost179
-    cmark
-    coeurl
-    curl
-    kdsingleapplication
-    libevent
-    libsecret
-    lmdb
-    mtxclient
-    nlohmann_json
-    olm
-    qtbase
-    qtimageformats
-    qtkeychain
-    qtmultimedia
-    qttools
-    qtwayland
-    re2
-    spdlog
-  ]
-  ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    (gst-plugins-good.override { qt6Support = true; })
-    gst-plugins-bad
-    libnice
-  ]);
+  buildInputs =
+    [
+      boost179
+      cmark
+      coeurl
+      curl
+      kdsingleapplication
+      libevent
+      libsecret
+      lmdb
+      mtxclient
+      nlohmann_json
+      olm
+      qt6Packages.qtbase
+      qt6Packages.qtimageformats
+      qt6Packages.qtkeychain
+      qt6Packages.qtmultimedia
+      qt6Packages.qttools
+      qt6Packages.qtwayland
+      re2
+      spdlog
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      (gst-plugins-good.override { qt6Support = true; })
+      gst-plugins-bad
+      libnice
+    ]);
 
   cmakeFlags = [
     "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
@@ -91,7 +87,11 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Nheko-Reborn/nheko";
     license = licenses.gpl3Plus;
     mainProgram = "nheko";
-    maintainers = with maintainers; [ ekleog fpletz rnhmjoj ];
+    maintainers = with maintainers; [
+      ekleog
+      fpletz
+      rnhmjoj
+    ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6ccf48da478..0524c9849c44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31589,8 +31589,6 @@ with pkgs;
 
   ngt = callPackage ../development/libraries/ngt { };
 
-  nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };
-
   notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };
 
   notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };