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

mount-cifs.

svn path=/nixpkgs/trunk/; revision=22124
wip/yesman
Eelco Dolstra 14 years ago
parent f92200b710
commit 108f63eb80
  1. 17
      pkgs/os-specific/linux/cifs-utils/default.nix
  2. 15
      pkgs/os-specific/linux/mount-cifs/default.nix
  3. 8
      pkgs/top-level/all-packages.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";
};
}

@ -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
'';
}

@ -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;

Loading…
Cancel
Save