From a6518956f92335a42cacd3a2a82ad8802d0371d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 29 Apr 2011 18:18:56 +0000 Subject: [PATCH] Attempt to fix the vsftpd build on i686-linux svn path=/nixpkgs/trunk/; revision=27054 --- pkgs/servers/ftp/vsftpd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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" )