Unverified Commit 879306c3 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

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

parents 3347224a 377c92a9

nixos/modules/tasks/filesystems/cifs.nix

+3 −2
Original line number Diff line number Diff line
@@ -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

+8 −1
Original line number Diff line number Diff line
@@ -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";