cifs-utils: split bin, dev & man outputs (#482338)

nixos/modules/tasks/filesystems/cifs.nix

@@ -10,6 +10,7 @@ with lib;
 let
 
   inInitrd = config.boot.initrd.supportedFilesystems.cifs or false;
+  mount_cifs = "${lib.getBin pkgs.cifs-utils}/sbin/mount.cifs";
 
 in
 
@@ -29,10 +30,10 @@ in
     ];
 
     boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''
-      copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs
+      copy_bin_and_libs ${mount_cifs}
     '';
 
-    boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd "${pkgs.cifs-utils}/sbin/mount.cifs";
+    boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd mount_cifs;
 
   };
 }

pkgs/by-name/ci/cifs-utils/package.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "ROOTSBINDIR=$(out)/sbin"
+    "ROOTSBINDIR=$(bin)/sbin"
   ]
   ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # AC_FUNC_MALLOC is broken on cross builds.
@@ -48,6 +48,13 @@ stdenv.mkDerivation rec {
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
+  outputs = [
+    "out"
+    "bin"
+    "man"
+    "dev"
+  ];
+
   meta = {
     homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
     description = "Tools for managing Linux CIFS client filesystems";