ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-18 04:37:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: orbit2: Fix parallel build.

Browse source 
* 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>
This commit is contained in:
Vivien Kraus 2021-11-09 15:02:30 +01:00 committed by Maxim Cournoyer
parent 79ca578182
commit 9273d83bc3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/gnome.scm
View file

@ -3636,11 +3636,19 @@ (define-public orbit2
;; ... which they then completly ignore !! ;; ... which they then completly ignore !!
#:phases #:phases
(modify-phases %standard-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 (add-before 'configure 'ignore-deprecations
(lambda _ (lambda _
(substitute* "linc2/src/Makefile.in" (substitute* "linc2/src/Makefile.in"
(("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) (("-DG_DISABLE_DEPRECATED")
#t))))) "-DGLIB_DISABLE_DEPRECATION_WARNINGS")))))))
(inputs `(("glib" ,glib) (inputs `(("glib" ,glib)
("libidl" ,libidl))) ("libidl" ,libidl)))
(native-inputs (native-inputs