diff options
| -rw-r--r-- | nongnu/packages/steam-client.scm | 3 | ||||
| -rw-r--r-- | nonguix/multiarch-container.scm | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nongnu/packages/steam-client.scm b/nongnu/packages/steam-client.scm index 2f313c7..c8ff950 100644 --- a/nongnu/packages/steam-client.scm +++ b/nongnu/packages/steam-client.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2023 Elijah Malaby +;;; Copyright © 2023 Timo Wilken <guix@twilken.net> (define-module (nongnu packages steam-client) #:use-module ((guix licenses) #:prefix license:) @@ -200,6 +201,8 @@ all games will be installed."))) (nonguix-container (inherit steam-container) (name "steam-nvidia") + ;; Steam's .desktop files expect a "steam" executable, so provide that. + (binary-name "steam") (union64 (replace-mesa (ngc-union64 steam-container))) (union32 (replace-mesa (ngc-union32 steam-container))))) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index b333b71..8d3bf70 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2023 Elijah Malaby +;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; The script provided by this package may optionally be started as ;;; a shell instead of automatically launching the wrapped entrypoint by setting @@ -50,6 +51,7 @@ #:export (nonguix-container nonguix-container? ngc-name + ngc-binary-name ngc-version ngc-wrap-package ngc-run @@ -82,6 +84,7 @@ nonguix-container make-nonguix-container nonguix-container? this-nonguix-container (name ngc-name) + (binary-name ngc-binary-name (default (ngc-name this-nonguix-container)) (thunked)) (version ngc-version (default #f)) (wrap-package ngc-wrap-package) (run ngc-run) @@ -207,7 +210,7 @@ in a sandboxed FHS environment." (manifest-target (assoc-ref %build-inputs "fhs-manifest")) (manifest-dest (string-append out "/etc/" ,(ngc-manifest-name container))) (wrapper-target (assoc-ref %build-inputs "fhs-wrapper")) - (wrapper-dest (string-append out "/bin/" ,(ngc-name container))) + (wrapper-dest (string-append out "/bin/" ,(ngc-binary-name container))) (link-files ',(ngc-link-files container))) (mkdir-p (string-append out "/sbin")) (mkdir-p (string-append out "/etc")) @@ -528,7 +531,7 @@ application." (if asound32-opt (display "\n\n/etc/asound.conf configured for 32-bit.\n\n\n") (display (string-append "\n\n/etc/asound.conf configured for 64-bit.\nLaunch " - #$(ngc-name container) + #$(ngc-binary-name container) " with \"" (basename #$(ngc-run container)) " -- --asound32\" to use 32-bit instead.\n\n\n"))) |