diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-03 19:52:14 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-03 19:52:14 +0100 |
| commit | 2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85 (patch) | |
| tree | 5d6f4ca2d683d470c058754637aed28089517552 /pkgs/servers/ftp | |
| parent | a72f66aded17240eba4d728608b5c15021fa4f0f (diff) | |
| download | nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar.gz nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar.bz2 nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar.lz nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar.xz nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.tar.zst nixpkgs-2169b0ab2e01a4bc3b3ed3fecaa413b13f1def85.zip | |
vsftpd: fixing build in x86_64/i686
It was building fine in the sheevaplug though.
Diffstat (limited to 'pkgs/servers/ftp')
| -rw-r--r-- | pkgs/servers/ftp/vsftpd/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 6dc3cc16297..39b78958b03 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -14,9 +14,13 @@ stdenv.mkDerivation (rec { sed -i -e 's/-idirafter.*//' Makefile ''; - preBuild ='' - makeFlagsArray=( "LIBS=${if sslEnable then "-lcrypt -lssl -lcrypto " else ""}-lpam -lcap" ) - ''; + preBuild = let + sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else ""; + in '' + makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" ) + ''; + + # It won't link without this flag, used in CFLAGS buildInputs = [ openssl libcap pam ]; |