This is a followup to commit c7e6962eb3.
* nonguix/build-system/binary.scm (default-patchelf): Add comment and TODO
about using older patchelf-0.16 due to upstream bug.
Reported-by: Attila Lendvai <attila@lendvai.name>
Newer patchelf may break binaries.
This commit replaces patchelf with patchelf-0.16 for binary-build-system and
nvidia-driver (known affected package).
Fixes: https://gitlab.com/nonguix/nonguix/-/issues/350
* nonguix/build-system/binary.scm (default-patchelf): Replace patchelf with
patchelf-0.16.
* nongnu/packages/nvidia.scm (nvidia-driver)[native-inputs]: Likewise.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
.deb could contain data.tar compressed in any format, not just .xz as it
assumes now.
* nonguix/build/binary-build-system (unpack-deb): find a data.tar archive to
extract.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
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>
We rely on the upstream implementation to avoid duplicating effort.
* nonguix/build/chromium-binary-build-system (install-wrapper): Use
search-path-as-list;
* nonguix/build/utils.scm (build-paths-for-input): remove variable;
(build-paths-from-inputs): remove variable.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve TZ and TZDIR.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
* nonguix/multiarch-container.scm (make-container-wrapper): Set
LIBVA_DRIVERS_PATH and preserve it.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve environment
variables and share socket for Wayland.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
* nonguix/multiarch-container.scm (make-internal-script): Symlink all
available Vulkan layers.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
* nonguix/multiarch-container.scm (make-container-wrapper): Use
ngc-preserved-env.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
Basic fix for #237.
This allows exposing other directories or drives to the nonguix container, for
example to add additional library locations to Steam, by setting
$GUIX_SANDBOX_EXTRA_SHARES.
* nonguix/multiarch-container.scm (make-container-wrapper): Use environment
variable $GUIX_SANDBOX_EXTRA_SHARES to pass extra directories to share with
the container.
Fixes#303.
Previously LD_LIBRARY_PATH was being set before the container was launched,
which could cause issues on some foreign distros where this alters what is
loaded from an FHS structure. This was only meant to be set inside the
container, though this didn't cause any issues on a Guix System.
* nonguix/multiarch-container.scm (make-container-wrapper): Move setting
LD_LIBRARY_PATH from here ...
(make-internal-script): ... to here.
Fixes#277.
See discussion in above issue for details and some education on what went
wrong here. In short, we didn't capture the needed (guix build utils) module
in the container script. On a Guix System this didn't cause any problems as
guix modules are found through set Guile environment variables. But on a
foreign distro these weren't set without hacky workarounds. This prevented
Steam from launching with a "no code for module" error.
* nonguix/multiarch-container.scm (make-container-wrapper)[make-container-wrapper]:
Use 'with-imported-modules' for (guix build utils).
The binary-unpack phase suffered from a problem for unknown binary file
extensions, see: !336 (comment 1709385147) . This patch fixes the
incorrect behavior by effectively restoring the state of the directory
tree before the phase.
* nonguix/build/binary-build-system.scm (binary-unpack): Restore the
environment as it was before this phase.
* nongnu/packages/clojure.scm (clj-kondo)[arguments]: No longer delete
'binary-unpack phase.
* nongnu/packages/game-development.scm (libsteam)[arguments]: dito.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/game-client.scm (heroic-client, heroic-extra-client-libs,
heroic-container, heroic-nvidia-container, heroic, heroic-nvidia): New
variables.
* nonguix/multi-arch-container.scm (make-container-wrapper): Preserve "^SSL_"
for heroic to use curl.
(make-internal-script): Add symlink for "/usr/share/glib-2.0".
Steam installs .desktop files that refer to an executable called `steam'.
Installing steam-nvidia as the `steam-nvidia' executable breaks this, which
means Steam cannot be launched from its desktop icon. This also applies to
.desktop files for individual games generated by Steam, when they are copied
from `<ngc-sandbox-home>/.local/share/applications/'.
Fix this by always installing Steam's wrapper executable as `steam'. We add a
new field using "binary" to keep things shorter.
This has the downside that the `steam' and `steam-nvidia' packages cannot be
installed in the same profile, but likely people wouldn't want to do this
anyway.
Fixes#294.
* nongnu/packages/steam-client.scm (steam-nvidia-container)[binary-name]:
Specify for compatibility with .desktop files.
* nonguix/multiarch-container.scm (<nonguix-container>)[binary-name,
ngc-binary-name]: New field and accessor.
(nonguix-container->package): Use it to set correct executable name.
(make-internal-script): Use it in message.
Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
A new binary-unpack phase is added to the binary-build-system. When a
supported binary file is detected as the only file after the unpack
phase it is then decompressed in a specific directory.
* nonguix/build/binary-build-system.scm (deb-file?): new variable;
(unpack-deb): new variable;
(binary-unpack): new variable;
(%standard-phases): use the new phase.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Steam's pressure-vessel startup time can be improved by not having to generate
locales. So make sure locales are in and used by the pressure-vessel
container by linking the expected location of /usr/lib/locale (presumably so
that pressure-vessel will capture them) and setting $GUIX_LOCPATH.
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve and set
GUIX_LOCPATH.
(make-internal-script): Add symlink for /usr/lib/locale.
Now one can have set MANGOHUD=1 in their environment to have all Steam games
launch with MangoHud, rather than always setting this per game launch
settings. Likewise for MANGOHUD_CONFIG for configuration.
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve MANGOHUD
environment variables.
Setting $LD_LIBRARY_PATH in the container allows for non-Steam games added to
Steam to launch properly with Proton. Otherwise they don't make it to the
pressure-vessel container as it seems they start in an environment where the
rest of our setup is not active (e.g. game will fail to launch with an error
about being unable to load libGL.so.1).
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve
LD_LIBRARY_PATH and set it.
Setting $PRESSURE_VESSEL_FILESYSTEMS_RO to "/gnu/store" is no longer needed
for Steam as the fix has been merged upstream. Users can still set this
environment variable (preserved in the container) if needed.
* nonguix/multiarch-container.scm (make-container-wrapper): Remove setting
$PRESSURE_VESSEL_FILESYSTEMS_RO.
In 0.7.0 of MangoHud the vulkan implicit layers have different names for 32-
and 64-bit so we no longer need a workaround.
* nonguix/multiarch-container.scm (make-internal-script): No longer create
/usr/share/vulkan/implicit_layer.d. Symlink instead directly from guix-env.
Remove vulkan layer renaming from mangohud.
Finally, it's back! Using something like snixembed worked around this before
by using a different tray icon format.
* nongnu/packages/steam-client.scm (steam-client-libs): Add gdk-pixbuf.
* nonguix/multiarch-container.scm (make-internal-script): Add symlink to
/usr/share/mime.
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>
nonguix: Make container actually respect the ngc-shared and ngc-exposed fields.
* nongnu/packages/steam-client.scm (steam-container): New variable. This is to
export the container definition from steam.
(steam-nvidia-container): New variable. This is the container for steam-nvidia
and now inherits from steam-container.
(steam, steam-nvidia): Container definitions moved to steam-container and
steam-nvidia-container.
* nonguix/multiarch-container.scm (make-container-wrapper): Add ngc-exposed and
ngc-shared to expose and share lists.
Signed-off-by: ison <ison@airmail.cc>
* nonguix/multiarch-container.scm: New file. This module makes the container
code from steam-client.scm usable by other packages which require multiarch
support (which is not currently supported by the upstream Guix FHS container).
Signed-off-by: ison <ison@airmail.cc>
Follow up to a0079cf1bd.
* nonguix/build/binary-build-system.scm (patchelf)[make-rpath]: Use 'name'
instead of undefined 'input-or-output'.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Makes it possible to define entries like the following in the patchelf-plan:
("the-binary" ("glibc" ("nss" "/lib/nss")))
* nonguix/build/binary-build-system.scm (maybe-make-rpath, make-rpath):
New functions and use them.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nonguix/build-system/binary.scm (lower): Adapt the default value of the
install plan.
* nonguix/build/binary-build-system.scm (new-install): New procedure.
(old-install): Rename former `install' procedure to this.
(install): New procedure that dispatches over old-install and new-install.
