* Added cifs-utils (mount.cifs properly packaged). This obsoletes

  mount-cifs.

svn path=/nixpkgs/trunk/; revision=22124

3 files changed, 21 insertions, 19 deletions

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
new file mode 100644
index 00000000000..d49fe20f1ad
--- /dev/null
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+   
+stdenv.mkDerivation rec {
+  name = "cifs-utils-4.5";
+   
+  src = fetchurl {
+    url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
+    sha256 = "0nzjxhhs86ws1dzi2qgmxbkn6pcri7915r0sd51317b0b5n9k1w2";
+  };
+
+  makeFlags = "root_sbindir=$(out)/sbin";
+
+  meta = {
+    homepage = http://www.samba.org/linux-cifs/cifs-utils/;
+    description = "Tools for managing Linux CIFS client filesystems";
+  };
+}
diff --git a/pkgs/os-specific/linux/mount-cifs/default.nix b/pkgs/os-specific/linux/mount-cifs/default.nix
deleted file mode 100644
index 490e6e05cba..00000000000
--- a/pkgs/os-specific/linux/mount-cifs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "mount.cifs";
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/mount_cifs-20090330.c;
-    sha256 = "1d9v3qzic3d12vna8g7d1zsl1piwm20f6xhck319rbfkrdg0smnl";
-  };
- 
-  buildCommand = ''
-    ensureDir $out/sbin
-    gcc -Wall $src -o $out/sbin/mount.cifs
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4c1fd231d..38423f95bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6009,6 +6009,10 @@ let
     inherit fetchurl stdenv autoconf automake;
   };
 
+  cifs_utils = import ../os-specific/linux/cifs-utils {
+    inherit fetchurl stdenv;
+  };
+
   conky = import ../os-specific/linux/conky {
     inherit stdenv fetchurl pkgconfig libxml2 curl wirelesstools openssl;
     inherit (gtkLibs) glib;
@@ -6632,10 +6636,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  mount_cifs = import ../os-specific/linux/mount-cifs {
-    inherit fetchurl stdenv;
-  };
-
   aggregateModules = modules:
     import ../os-specific/linux/module-init-tools/aggregator.nix {
       inherit stdenv module_init_tools modules buildEnv;