From 27df79a45ec48b2c44e6f855958ad85c2074c29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 30 Oct 2024 16:49:35 +0100
Subject: [PATCH 1/2] cifs-utils: format with nixfmt-rfc-style

---
 pkgs/os-specific/linux/cifs-utils/default.nix | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index cae7901386d19..9c905b7cca6bb 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
-, libkrb5, keyutils, pam, talloc, python3 }:
+{
+  stdenv,
+  lib,
+  fetchurl,
+  autoreconfHook,
+  docutils,
+  pkg-config,
+  libkrb5,
+  keyutils,
+  pam,
+  talloc,
+  python3,
+}:
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
@@ -10,16 +21,28 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE=";
   };
 
-  nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
-
-  buildInputs = [ libkrb5 keyutils pam talloc python3 ];
+  nativeBuildInputs = [
+    autoreconfHook
+    docutils
+    pkg-config
+  ];
 
-  configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    # AC_FUNC_MALLOC is broken on cross builds.
-    "ac_cv_func_malloc_0_nonnull=yes"
-    "ac_cv_func_realloc_0_nonnull=yes"
+  buildInputs = [
+    keyutils
+    libkrb5
+    pam
+    python3
+    talloc
   ];
 
+  configureFlags =
+    [ "ROOTSBINDIR=$(out)/sbin" ]
+    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      # AC_FUNC_MALLOC is broken on cross builds.
+      "ac_cv_func_malloc_0_nonnull=yes"
+      "ac_cv_func_realloc_0_nonnull=yes"
+    ];
+
   meta = with lib; {
     homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
     description = "Tools for managing Linux CIFS client filesystems";

From f4fdf302a7f85f2e5b7d7a54efe72d95fec09ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 30 Oct 2024 16:55:13 +0100
Subject: [PATCH 2/2] cifs-utils: add optional dependencies

for cifs.idmap, getcifsacl and setcifsacl and capability dropping in mount.cifs
---
 pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index 9c905b7cca6bb..e05e31e9c2d71 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -5,9 +5,11 @@
   autoreconfHook,
   docutils,
   pkg-config,
+  libcap,
   libkrb5,
   keyutils,
   pam,
+  samba,
   talloc,
   python3,
 }:
@@ -29,9 +31,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     keyutils
+    libcap
     libkrb5
     pam
     python3
+    samba
     talloc
   ];