diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-29 18:18:56 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-29 18:18:56 +0000 |
| commit | a6518956f92335a42cacd3a2a82ad8802d0371d5 (patch) | |
| tree | 13a859ed0df9955cd6b7cbd74a8179a5bb223501 /pkgs/servers/ftp | |
| parent | 270ea3beec0d484fde10e667c069ff308b1fcbe1 (diff) | |
| download | nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar.gz nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar.bz2 nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar.lz nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar.xz nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.tar.zst nixpkgs-a6518956f92335a42cacd3a2a82ad8802d0371d5.zip | |
Attempt to fix the vsftpd build on i686-linux
svn path=/nixpkgs/trunk/; revision=27054
Diffstat (limited to 'pkgs/servers/ftp')
| -rw-r--r-- | pkgs/servers/ftp/vsftpd/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index d1de493e39e..0fc1531056b 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -7,6 +7,12 @@ stdenv.mkDerivation (rec { url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz"; sha256 = "0nhsqwnb8qkbxx5wjahara1ln85hp151v656psra5brpckwysrml"; }; + + # The gcc-wrappers use -idirafter for glibc, and vsftpd also, and + # their dummyinc come before those of glibc, then the build works bad. + prePatch = '' + sed -i -e 's/-idirafter.*//' Makefile + ''; preBuild ='' makeFlagsArray=( "LIBS=${if sslEnable then "-lcrypt -lssl -lcrypto " else ""}-lpam -lcap" ) |