diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-02-04 08:15:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 08:15:59 +0000 |
| commit | e1a454d6a24cabc986c193bc6bc8969340504131 (patch) | |
| tree | 4c527302624059b272e11cae8b634bae8015cce7 | |
| parent | bdd29411405dc09346634a2b44de97bad25dd529 (diff) | |
| parent | 09720f1dc34556fa7cf0ea1b8616e108d2ada208 (diff) | |
| download | nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar.gz nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar.bz2 nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar.lz nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar.xz nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.tar.zst nixpkgs-e1a454d6a24cabc986c193bc6bc8969340504131.zip | |
Merge pull request #214305 from squalus/libreoffice-postgresql
libreoffice: support postgresql by default
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 |
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 |