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

  mount-cifs.

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

2 files changed, 17 insertions, 15 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 000000000000..d49fe20f1ade
--- /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 490e6e05cbaa..000000000000
--- 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
-  '';
-}