mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 09:37:59 +03:00
Merge pull request #214305 from squalus/libreoffice-postgresql
libreoffice: support postgresql by default
This commit is contained in:
commit
e1a454d6a2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user