~ruther/guix-local: gnu: orbit2: Fix parallel build.

9273d83bc3b1b3c1925c01f8fddde794d7b55025 — Vivien Kraus 4 years ago 79ca578

gnu: orbit2: Fix parallel build.

* gnu/packages/gnome.scm (orbit2): Remove trailing #t.
[phases]: Add a phase so that orbit-name-server-2 depends on
libname-server-2.a.

Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

patch browse .tar.gz .zip

1 files changed, 10 insertions(+), 2 deletions(-)

M gnu/packages/gnome.scm

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +10 -2

@@ 3636,11 3636,19 @@ functionality was designed to be as reusable and portable as possible.")
        ;; ... which they then completly ignore !!
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-parallel-build
+           ;; Parallel build fails because of a failed dependency,
+           ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274
+           (lambda _
+             (substitute* "src/services/name/Makefile.am"
+               (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h")
+                "orbit_name_server_2_DEPENDENCIES = \
+$(DEPS) CosNaming.h libname-server-2.a"))))
          (add-before 'configure 'ignore-deprecations
            (lambda _
              (substitute* "linc2/src/Makefile.in"
-               (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
-             #t)))))
+               (("-DG_DISABLE_DEPRECATED")
+                "-DGLIB_DISABLE_DEPRECATION_WARNINGS")))))))
     (inputs `(("glib" ,glib)
               ("libidl" ,libidl)))
     (native-inputs