diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-07 16:14:59 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-07 16:38:57 +0100 |
commit | 10e31f6de73536ff545e1799ae72c9f2ab423202 (patch) | |
tree | d80f8f35f132b243846029ccf85439fc7e1b3e66 /pkgs/servers/ftp | |
parent | 8c9c3b628f97f9d02b41090d129ba2bb1d05566b (diff) | |
download | nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar.gz nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar.bz2 nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar.lz nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar.xz nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.tar.zst nixpkgs-10e31f6de73536ff545e1799ae72c9f2ab423202.zip |
Clean up the vsftpd module a bit
Diffstat (limited to 'pkgs/servers/ftp')
-rw-r--r-- | pkgs/servers/ftp/vsftpd/default.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 39b78958b03..3b9b32898e2 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,23 +1,29 @@ { stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "vsftpd-3.0.2"; - + src = fetchurl { url = "https://security.appspot.com/downloads/${name}.tar.gz"; sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy"; }; + preConfigure = stdenv.lib.optionalString sslEnable '' + echo "Will enable SSL" + sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h + ''; + # 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 = let - sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else ""; + + preBuild = + let + sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto" else ""; in '' - makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" ) + makeFlagsArray=( "LIBS=${sslLibs} -lpam -lcap -fstack-protector" ) ''; # It won't link without this flag, used in CFLAGS @@ -35,11 +41,4 @@ stdenv.mkDerivation (rec { mkdir -pv $out/etc/xinetd.d install -v -m 644 xinetd.d/vsftpd $out/etc/xinetd.d/vsftpd ''; -} // (if sslEnable then { - preConfigure = '' - echo "Will enable SSL" - sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h - ''; - -} else { }) -) +} |