vsftpd: builds with gcc-4.2 now

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

View file

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

View file

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