diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-22 18:57:13 -0600 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-22 20:25:45 -0500 |
| commit | 16b6e5a45295765071ad0bef3845d7b829a7cbd5 (patch) | |
| tree | ab2c1e50f6be78282eb10e0a6561d32af05b8d4f /pkgs/development/libraries/libxslt | |
| parent | 2b04cddf7e9e485e7ee69390cd76710099bcf768 (diff) | |
| download | nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar.gz nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar.bz2 nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar.lz nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar.xz nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.tar.zst nixpkgs-16b6e5a45295765071ad0bef3845d7b829a7cbd5.zip | |
libxslt: make configureFlags unconditional, re-org to address comment
Diffstat (limited to 'pkgs/development/libraries/libxslt')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
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" |