From 66097104090e06c43a784193809bc8843a2ec052 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Jul 2010 11:55:54 +0000
Subject: * Get rid of many instances of "args: with args;", and other coding  
 guidelines violations. * Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
---
 pkgs/servers/ftp/vsftpd/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'pkgs/servers/ftp/vsftpd/default.nix')

diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 10e6d658714..85006a1d175 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, openssl, libcap, pam }:
 
 stdenv.mkDerivation rec {
   name = "vsftpd-2.0.5";
+  
   src = fetchurl {
     url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
     sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
@@ -10,16 +11,18 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
 
   preInstall = ''
-  ensureDir $out/{,s}bin
-  ensureDir $out/man/man{5,8}
+    ensureDir $out/{,s}bin
+    ensureDir $out/man/man{5,8}
   '';
 
   patches = [ ./fix.patch ] ;
-  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h;
-                   sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c'';
+  
+  preConfigure = ''
+    sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h
+    sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c
+  '';
 
-  configFile = ./vsftpd.user_list;
   postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list";
 
-  buildInputs = [ openssl libcap pam configFile ];
+  buildInputs = [ openssl libcap pam ];
 }
-- 
cgit 1.4.1