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

vsftpd: builds with gcc-4.2 now

Browse Source 
svn path=/nixpkgs/trunk/; revision=10435
This commit is contained in:
Yury G. Kudryashov 2008-01-31 14:08:02 +00:00
parent 4d5a4ea903
commit aa83977d83
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/ftp/vsftpd/default.nix
View File

@ -1,16 +1,20 @@
{stdenv, fetchurl, openssl}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "vsftpd-2.0.3"; name = "vsftpd-2.0.5";
src = fetchurl { src = fetchurl {
url = ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.3.tar.gz; url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
md5 = "74936cbd8e8251deb1cd99c5fb18b6f8"; 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 ] ; patches = [ ./fix.patch ] ;
buildInputs = [ openssl ]; preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h'';
buildInputs = [ openssl libcap pam ];
} }

3
pkgs/top-level/all-packages.nix
View File

@ -3239,8 +3239,7 @@ rec {
}; };
vsftpd = import ../servers/ftp/vsftpd { vsftpd = import ../servers/ftp/vsftpd {
inherit fetchurl openssl ; inherit fetchurl openssl stdenv libcap pam;
stdenv = overrideGCC stdenv gcc295 ;
}; };
xorg = recurseIntoAttrs (import ../servers/x11/xorg { xorg = recurseIntoAttrs (import ../servers/x11/xorg {