From 50d63e1e3f01451c34923e6ea9d67ae1a1d183c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 11 Dec 2016 18:06:40 +0100 Subject: [PATCH] libxslt: add option to enable crypto support --- pkgs/development/libraries/libxslt/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ebad3fd3eb1..7798c806982 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs -, python2, pythonSupport ? (! stdenv ? cross) +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +, cryptoSupport ? false +, pythonSupport ? (! stdenv ? cross) }: assert pythonSupport -> python2 != null; assert pythonSupport -> libxml2.pythonSupport; +with stdenv.lib; + stdenv.mkDerivation rec { name = "libxslt-1.1.29"; @@ -21,18 +24,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; - configureFlags = [ - "--without-crypto" + # TODO move cryptoSupport as last flag, when upgrading libxslt + configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ stdenv.lib.optional pythonSupport "--with-python=${python2}"; + ] ++ optional pythonSupport "--with-python=${python2}"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + stdenv.lib.optionalString pythonSupport '' + '' + optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs moveToOutput lib/python2.7 "$py"