Nixfmt

1 files changed, 64 insertions, 61 deletions

diff --git a/modules/packages/nheko-git.nix b/modules/packages/nheko-git.nix
index adc3a09..c38e622 100644
--- a/modules/packages/nheko-git.nix
+++ b/modules/packages/nheko-git.nix
@@ -1,37 +1,38 @@
 # This file was copied from NUR: https://github.com/nix-community/nur-combined/blob/master/repos/deeunderscore/pkgs/nheko/default.nix#L93
 # This file is a modified version of nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix (copied at 2e896fce)
 
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-#, wrapQtAppsHook
-, asciidoctor
-, qt6
-, qt6Packages
-#, qtmultimedia
-#, qtimageformats
-#, qtkeychain
-, cmark
-, coeurl
-, curl
-, libevent
-, lmdb
-, lmdbxx
-#, mtxclient
-, nlohmann_json
-, olm
-, pkg-config
-, re2
-, spdlog
-, httplib
-, voipSupport ? true
-, gst_all_1
-, libnice
-, kdsingleapplication
-, pkgs
-, nhekoSrc
-, mtxclientSrc
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  #, wrapQtAppsHook
+  asciidoctor,
+  qt6,
+  qt6Packages,
+  #, qtmultimedia
+  #, qtimageformats
+  #, qtkeychain
+  cmark,
+  coeurl,
+  curl,
+  libevent,
+  lmdb,
+  lmdbxx,
+  #, mtxclient
+  nlohmann_json,
+  olm,
+  pkg-config,
+  re2,
+  spdlog,
+  httplib,
+  voipSupport ? true,
+  gst_all_1,
+  libnice,
+  kdsingleapplication,
+  pkgs,
+  nhekoSrc,
+  mtxclientSrc,
 }:
 
 stdenv.mkDerivation {
@@ -47,32 +48,37 @@ stdenv.mkDerivation {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qt6.qtbase
-    qt6.qttools
-    qt6.qtsvg
-    qt6.qtmultimedia
-    qt6.qtimageformats
-    qt6Packages.qtkeychain
-    kdsingleapplication
-    cmark
-    coeurl
-    curl
-    libevent
-    lmdb
-    (pkgs.callPackage ./mtxclient-git.nix { inherit mtxclientSrc; })
-    nlohmann_json
-    olm
-    re2
-    spdlog
-    httplib
-  ] ++ lib.optionals voipSupport (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    (gst-plugins-good.override { qt5Support = true; })
-    gst-plugins-bad
-    libnice
-  ]);
+  buildInputs =
+    [
+      qt6.qtbase
+      qt6.qttools
+      qt6.qtsvg
+      qt6.qtmultimedia
+      qt6.qtimageformats
+      qt6Packages.qtkeychain
+      kdsingleapplication
+      cmark
+      coeurl
+      curl
+      libevent
+      lmdb
+      (pkgs.callPackage ./mtxclient-git.nix { inherit mtxclientSrc; })
+      nlohmann_json
+      olm
+      re2
+      spdlog
+      httplib
+    ]
+    ++ lib.optionals voipSupport (
+      with gst_all_1;
+      [
+        gstreamer
+        gst-plugins-base
+        (gst-plugins-good.override { qt5Support = true; })
+        gst-plugins-bad
+        libnice
+      ]
+    );
 
   LC_ALL = lib.optionalString (!stdenv.isDarwin) "C.UTF-8";
 
@@ -82,11 +88,8 @@ stdenv.mkDerivation {
     "-DBUILD_SHARED_LIBS=OFF"
     #Rory&
     "-DMAN=OFF"
-    
-  ] ++ lib.optionals (!voipSupport) [
-    "-DVOIP=OFF"
-  ];
 
+  ] ++ lib.optionals (!voipSupport) [ "-DVOIP=OFF" ];
 
   preFixup = lib.optionalString voipSupport ''
     # add gstreamer plugins path to the wrapper