From 16b6e5a45295765071ad0bef3845d7b829a7cbd5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 22 Jan 2018 18:57:13 -0600
Subject: libxslt: make configureFlags unconditional, re-org to address comment

---
 pkgs/development/libraries/libxslt/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries/libxslt')

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 62b68ff9ab8..8c72ce2c086 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -40,15 +40,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 
-  # TODO move cryptoSupport as last flag, when upgrading libxslt
-  configureFlags = []
-    ++ optional (buildPlatform != hostPlatform) "--with-libxml-prefix=${libxml2.dev}"
-    ++ optional (!cryptoSupport) "--without-crypto"
-    ++ [
+  configureFlags = [
+    "--with-libxml-prefix=${libxml2.dev}"
     "--without-debug"
     "--without-mem-debug"
     "--without-debugger"
-  ] ++ optional pythonSupport "--with-python=${python2}";
+  ] ++ optional pythonSupport "--with-python=${python2}"
+    ++ optional (!cryptoSupport) "--without-crypto";
 
   postFixup = ''
     moveToOutput bin/xslt-config "$dev"
-- 
cgit 1.4.1