From f3c798dd7487cf7aa16facb2f6b397ec4de561e0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Oct 2017 18:14:59 +0200
Subject: [PATCH] libreoffice-fresh: take into account new nss header layout

---
 pkgs/applications/office/libreoffice/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 830692f08eb..63357861b38 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -65,8 +65,10 @@ 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${gpgme.dev}/include/gpgme++";
+  NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal"
+    "-I${nss.dev}/include/nss" "-I${gpgme.dev}/include/gpgme++" ];
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.