public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Get rid of many instances of "args: with args;", and other coding

Browse Source 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
This commit is contained in:
Eelco Dolstra
2010-07-28 11:55:54 +00:00
parent b4a3f99c78
commit 6609710409
132 changed files with 925 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/ftp/vsftpd/default.nix
+10 -7
View File
@@ -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 ];
}