Move CIFS support into a separate module

2014-07-30 10:49:31 +02:00
parent cf744cb715
commit b7c543136a
5 changed files with 34 additions and 25 deletions
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -28,6 +28,10 @@ let
  nixConfig = ''
    CONFIG_PREFIX "$out"
    CONFIG_INSTALL_NO_USR y
+
+    # Use the external mount.cifs program.
+    CONFIG_FEATURE_MOUNT_CIFS n
+    CONFIG_FEATURE_MOUNT_HELPERS y
  '';

  staticConfig = stdenv.lib.optionalString enableStatic ''
@@ -49,8 +53,8 @@ stdenv.mkDerivation rec {
    ${configParser}
    cat << EOF | parseconfig
    ${staticConfig}
-    ${extraConfig}
    ${nixConfig}
+    ${extraConfig}
    $extraCrossConfig
    EOF
    make oldconfig