summary refs log tree commit diff
path: root/pkgs/os-specific/linux/busybox/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-30 10:49:31 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-30 12:39:35 +0200
commitb7c543136a427ec130c7dbb87fb90dc2107ccb46 (patch)
tree146af4cfb8fd12c4d5a2de1e44fd3e545aa56e66 /pkgs/os-specific/linux/busybox/default.nix
parentcf744cb715ead592ff0b7ac2771a2d551d76b7f9 (diff)
downloadnixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.gz
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.bz2
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.lz
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.xz
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.tar.zst
nixpkgs-b7c543136a427ec130c7dbb87fb90dc2107ccb46.zip
Move CIFS support into a separate module
Diffstat (limited to 'pkgs/os-specific/linux/busybox/default.nix')
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 9e81508080d..98fedb2d3f4 100644
--- 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