summary refs log tree commit diff
path: root/pkgs/servers/ftp
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-31 14:08:02 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-31 14:08:02 +0000
commitaa83977d8348c5543aa5a81e5774060ee4558b8b (patch)
treeb0867f72daa630377a2c2b0b43123391a4bb104f /pkgs/servers/ftp
parent4d5a4ea903b20dcf4cd3d31b36ea5630056be6f5 (diff)
downloadnixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar.gz
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar.bz2
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar.lz
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar.xz
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.tar.zst
nixpkgs-aa83977d8348c5543aa5a81e5774060ee4558b8b.zip
vsftpd: builds with gcc-4.2 now
svn path=/nixpkgs/trunk/; revision=10435
Diffstat (limited to 'pkgs/servers/ftp')
-rw-r--r--pkgs/servers/ftp/vsftpd/default.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 861845ab24f..7961448428d 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,16 +1,20 @@
-{stdenv, fetchurl, openssl}:
+args: with args;
 
-stdenv.mkDerivation {
-  name = "vsftpd-2.0.3";
+stdenv.mkDerivation rec {
+  name = "vsftpd-2.0.5";
   src = fetchurl {
-    url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz;
-    md5 = "74936cbd8e8251deb1cd99c5fb18b6f8";
+    url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
+    sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
   };
   
-  NIX_LDFLAGS = [ "-lcrypt" "-lssl" "-lcrypto" ];
+  NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
 
-  builder = ./builder.sh ;
+  preInstall = ''
+  ensureDir $out/{,s}bin
+  ensureDir $out/man/man{5,8}
+  '';
 
   patches = [ ./fix.patch ] ;
-  buildInputs = [ openssl ];
+  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h'';
+  buildInputs = [ openssl libcap pam ];
 }