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

Revert "libreoffice-fresh: take into account new nss header layout"

Browse Source 
This reverts commit f3c798dd74.
This commit is contained in:
Robin Gloster 2017-10-09 20:50:14 +02:00
parent c8a2265513
commit 6c870f5e86
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,10 +65,8 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
# NSS update changed header layout
# And LO refers to gpgme++ by no-path name
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal"
"-I${nss.dev}/include/nss" "-I${gpgme.dev}/include/gpgme++" ];
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
# If we call 'configure', 'make' will then call configure again without parameters.
# It's their system.