This commit is similar to a0079cf1bd which
allowed patchelf-plan to take entries with an optional path. Here,
wrapper-plan is extended to allow for additional syntax (not just a list of
strings) similar to patchelf-plan. Now, entries can be a list, with the first
the string for the file to be patched and the second a list which is added to
the patchelf-plan.
This allows, for example, to patch RPATH to effectively have $ORIGIN for
binaries that need it, with an entry like `("bin/binary" (("out"
"/lib/Binary")))` common for some chromium-based packages. See followup
commits for these changes to reduce LD_LIBRARY_PATH wrapping in some packages.
* nonguix/build-system/chromium-binary.scm (build-patchelf-plan): Handle
entries in wrapper-plan which are a list so that the cdr is added to
patchelf-plan for the car.
(chromium-binary-build): Update doc string for this change and some basics
which were not documented.
Previously the resulting store object would also depend on the source.
* nonguix/build-system/chromium-binary.scm (lower): Remove reference to source
in #:wrap-inputs.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Effectively reverts changes that came from
9d58bb6e3e which doesn't seem to be needed
anymore. These got carried into chromium-binary-build-system when it was
introduced. We need libstdc++ from the gcc:lib package, which is hidden from
users but directly accessible from the build system. The library from
make-libstdc++ has missing symbols compared to the one from gcc:lib. The
addition of libgccjit seems to also be unneeded from this change and increases
the closure of e.g. signal-desktop by nearly 10% or 200 MiB.
Fixes#276 and #279.
* nonguix/build-system/chromium-binary.scm (lower)[host-inputs]: Use gcc:lib
again and remove libgccjit.
This build system is an extension to the binary-build-system, designed
to abstract some common boilerplate necessary for packaging Chromium
based software.
* nonguix/build-system/chromium-binary.scm: New file;
* nonguix/build/chromium-binary-build-system.scm: new file;
* nonguix/build/utils.scm (build-paths-for-input): new variable;
(build-paths-from-inputs): New variable.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
