dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libreoffice: add compile flag -fpermissive due to libcurl upgrade

Browse Source 
curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
therefore requires the -fpermissive flag until this package gets updated
This commit is contained in:
obadz 2016-08-01 13:22:03 +01:00
parent 34237beca6
commit 8d84e6a20f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -76,7 +76,9 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # 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. # If we call 'configure', 'make' will then call configure again without parameters.
# It's their system. # It's their system.

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -76,7 +76,9 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # 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. # If we call 'configure', 'make' will then call configure again without parameters.
# It's their system. # It's their system.