summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorsqualus <squalus@squalus.net>2023-02-02 16:59:30 -0800
committersqualus <squalus@squalus.net>2023-02-02 16:59:30 -0800
commit09720f1dc34556fa7cf0ea1b8616e108d2ada208 (patch)
tree0f5a9c2cce7e7738d3d332a3c8b70b6eb33e0b26 /pkgs
parent58e68a78716db89e8ea77b4f74f68c0a851e302e (diff)
downloadnixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar.gz
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar.bz2
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar.lz
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar.xz
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.tar.zst
nixpkgs-09720f1dc34556fa7cf0ea1b8616e108d2ada208.zip
libreoffice: support postgresql by default
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fdf76152a65..6590e625577 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -110,6 +110,7 @@
 , wrapQtAppsHook ? null
 , variant ? "fresh"
 , symlinkJoin
+, postgresql
 } @ args:
 
 assert builtins.elem variant [ "fresh" "still" ];
@@ -404,6 +405,7 @@ in
     "--with-system-libwps"
     "--with-system-openldap"
     "--with-system-coinmp"
+    "--with-system-postgresql"
 
     # Without these, configure does not finish
     "--without-junit"
@@ -418,7 +420,6 @@ in
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
     "--disable-odk"
-    "--disable-postgresql-sdbc"
     "--disable-firebird-sdbc"
     "--without-fonts"
     "--without-doxygen"
@@ -546,6 +547,7 @@ in
     pam
     perl
     poppler
+    postgresql
     python3
     sane-backends
     unixODBC