summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-01-02 14:07:16 +0000
committerGitHub <noreply@github.com>2017-01-02 14:07:16 +0000
commitc882915351ac81f3e687a22bc4ce7bf754fa1ed6 (patch)
tree6d471285896d97aafe7278399a4dbb374b38344a
parent8b03a76e61534c24648cae473ab9daf601d1d306 (diff)
parent9c61571f1a4119689d001bf1902869ca12f1c0b3 (diff)
downloadnixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar.gz
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar.bz2
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar.lz
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar.xz
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.tar.zst
nixpkgs-c882915351ac81f3e687a22bc4ce7bf754fa1ed6.zip
Merge pull request #21548 from FPtje/patch-2
Strongswan: enable rdrand and aes-ni only on X86
-rw-r--r--pkgs/tools/networking/strongswan/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1791abf4a48..7bcbb4fddb6 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -37,8 +37,9 @@ stdenv.mkDerivation rec {
       "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
       "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
-      "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ]
-    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
+      "--enable-af-alg" ]
+    ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
+    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ stdenv.lib.optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
          "--enable-curl" "--enable-openssl"