01/01: gnu: Fix problems building NSS due to platform dependence.

[John Darrington]

jmd pushed a commit to branch wip-libreoffice
in repository guix.

commit d05331a80f289a33b3c99fc41042a6bcf26b6cb2
Author: John Darrington <address@hidden>
Date:   Sat Nov 22 17:50:16 2014 +0100

    gnu: Fix problems building NSS due to platform dependence.
    
    * gnu/packages/libreoffice.scm (nss): Infer the name of the object
      directory instead of hard coding it.
---
 gnu/packages/libreoffice.scm |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 654b4cf..bd4d49e 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -646,19 +646,18 @@ converting various non-HTML reflowable e-book formats.")
                   (alist-replace
                    'install
                    (lambda* (#:key outputs #:allow-other-keys)
-                     (let ((out (assoc-ref outputs "out"))
-                           (objdir (string-append 
-                                    ,(match (%current-system) 
-                                            ("x86_64-linux" 
"Linux3.2_x86_64_glibc_PTH_64")
-                                            (_ (error "Unknown architecture 
for nss")))
-                                    "_DBG.OBJ")))
-
-                       (mkdir-p (string-append out "/lib/pkgconfig")) 
-
+                     (let* ((out (assoc-ref outputs "out"))
+                           ;; This is really kludgy: NSS creates its stuff in
+                           ;; a directory, whose name it invents on the fly.
+                           ;; We identify this directory by searching for the
+                           ;; file "config.status", which hopefully there is
+                           ;; only one of.
+                           (cfs (car (find-files "nspr" "config.status")))
+                           (objdir (basename (dirname cfs))))
+
+                       (mkdir-p (string-append out "/lib/pkgconfig"))
                        
-                       (system (string-append "ls -lR nspr/")) ; DIAGNOSTIC.  
Delete-me!
-
-                       (substitute* 
+                       (substitute*
                            (list
                             (string-append "nspr/" objdir "/config/nspr.pc"))
                          (("/usr/local") out)
@@ -682,12 +681,10 @@ Cflags: -I${prefix}/include/nss
                         (zero? (system  (string-append "cp -pLR dist/" objdir 
"/* " out)))
                         (zero? (system  (string-append "cp -pLR dist/public/* 
"  
                                                        (string-append
-                                                        out "/include")
-                                                       )))
+                                                        out "/include"))))
                         (zero? (system* "cp" 
                                         (string-append "nspr/" objdir 
"/config/nspr.pc")
-                                        (string-append out "/lib/pkgconfig")))
-                        )))
+                                        (string-append out 
"/lib/pkgconfig"))))))
                    %standard-phases)))))
     (inputs `(("zlib" ,zlib)))
     (native-inputs `(("perl" ,perl)