diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-10 01:07:08 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-10 10:26:14 +0200 |
| commit | f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa (patch) | |
| tree | a9973fd20d2b74d508f3705d70ad97ca30c697c1 /pkgs/tools/networking/shadowsocks-libev | |
| parent | 916cedb0635c88398563c46908d1389a3c404def (diff) | |
| download | nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar.gz nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar.bz2 nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar.lz nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar.xz nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.tar.zst nixlib-f1f6dc9b8708fada557daf6b44d4e7fbb551a1aa.zip | |
shadowsocks-libev: polarssl is now called mbedtls
Diffstat (limited to 'pkgs/tools/networking/shadowsocks-libev')
| -rw-r--r-- | pkgs/tools/networking/shadowsocks-libev/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index e12d25930210..eb30ba2368a8 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,8 +1,8 @@ -{ withPolarSSL ? false +{ withMbedTLS ? true , enableSystemSharedLib ? true , stdenv, fetchurl, zlib , openssl ? null -, polarssl ? null +, mbedtls ? null , libev ? null , libsodium ? null , udns ? null @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib ] - ++ optional (!withPolarSSL) openssl - ++ optional withPolarSSL polarssl + ++ optional (!withMbedTLS) openssl + ++ optional withMbedTLS mbedtls ++ optional enableSystemSharedLib [libev libsodium udns]; - configureFlags = optional withPolarSSL - [ "--with-crypto-library=polarssl" - "--with-polarssl=${polarssl}" + configureFlags = optional withMbedTLS + [ "--with-crypto-library=mbedtls" + "--with-mbedtls=${mbedtls}" ] ++ optional enableSystemSharedLib "--enable-system-shared-lib"; |