diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/servers/sql | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
| download | nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.zip | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/monetdb/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index afd2222918e..443dafef55c 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -17,7 +17,7 @@ composableDerivation.composableDerivation {} { /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ }; - buildInputs = [ (pcre.override { unicodeSupport = true; }) + buildInputs = [ pcre openssl readline libxml2 ]; # optional python perl php java ? cfg = { |