Author: viric
Date: Fri Apr 29 18:18:56 2011
New Revision: 27054
URL: https://svn.nixos.org/websvn/nix/?rev=27054&sc=1
Log:
Attempt to fix the vsftpd build on i686-linux
Modified:
nixpkgs/trunk/pkgs/servers/ftp/vsftpd/default.nix
Modified: nixpkgs/trunk/pkgs/servers/ftp/vsftpd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/ftp/vsftpd/default.nix Fri Apr 29 15:01:26
2011 (r27053)
+++ nixpkgs/trunk/pkgs/servers/ftp/vsftpd/default.nix Fri Apr 29 18:18:56
2011 (r27054)
@@ -7,6 +7,12 @@
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" )
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
