diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-01 13:22:03 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-01 13:23:30 +0100 |
| commit | 8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5 (patch) | |
| tree | 465a5d6dea3c34e8f4a4cca03abadb4264d742cc /pkgs/applications | |
| parent | 34237beca6206475dec1f1c68edf227401793382 (diff) | |
| download | nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar.gz nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar.bz2 nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar.lz nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar.xz nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.tar.zst nixlib-8d84e6a20fad4bab7d8a75ba7d4f45657ac464a5.zip | |
libreoffice: add compile flag -fpermissive due to libcurl upgrade
curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and therefore requires the -fpermissive flag until this package gets updated
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 63af5babca27..6b206bb13d9b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -76,7 +76,9 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and + # therefore requires the -fpermissive flag until this package gets updated + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index eadf41356308..248772b759f1 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -76,7 +76,9 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; + # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and + # therefore requires the -fpermissive flag until this package gets updated + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. |