Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-12-23 15:24:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: steam: Fix Desktop file and clean manifest.

Browse source 
nongnu/packages/steam-client.scm (steam)[steam.desktop]: Fix Exec typo.
[manifest]: Rename to manifest.scm, add newlines and comment.
This commit is contained in:
ison 2020-09-03 20:22:43 -06:00 committed by Pierre Neidhardt
parent 827b21bd39
commit a7a126daff
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nongnu/packages/steam-client.scm
View file

@ -367,7 +367,7 @@ in the Guix store"
(add-after 'unpack 'patch-desktop-file (add-after 'unpack 'patch-desktop-file
(lambda _ (lambda _
(substitute* "steam.desktop" (substitute* "steam.desktop"
(("Exec=/usr/bin/steam") "Exec=steam-sandbox")) (("Exec=/usr/bin/steam") "Exec=steam"))
#t)) #t))
;; /bin/steamdeps allows Steam to install missing packages, which doesn't play well with Guix, so remove it. ;; /bin/steamdeps allows Steam to install missing packages, which doesn't play well with Guix, so remove it.
(add-after 'install-binaries 'remove-unneccessary-file (add-after 'install-binaries 'remove-unneccessary-file
@ -392,7 +392,7 @@ in the Guix store"
(steam-real (move-file (string-append out "/bin/steam") (steam-real (move-file (string-append out "/bin/steam")
(string-append out "/bin/.steam-real"))) (string-append out "/bin/.steam-real")))
(manifest-dir (string-append out "/etc")) (manifest-dir (string-append out "/etc"))
(manifest-path (string-append manifest-dir "/manifest")) (manifest-path (string-append manifest-dir "/manifest.scm"))
(sandbox (string-append out "/bin/steam")) (sandbox (string-append out "/bin/steam"))
(sandbox-helper (string-append out "/bin/.sandbox-helper")) (sandbox-helper (string-append out "/bin/.sandbox-helper"))
(steam-libs-32 (assoc-ref inputs "steam-libs-32")) (steam-libs-32 (assoc-ref inputs "steam-libs-32"))
@ -413,6 +413,8 @@ in the Guix store"
(guix profiles) (guix profiles)
(guix store) (guix store)
(srfi srfi-11)) (srfi srfi-11))
;;; Copied from guix/scripts/package.scm
(define (store-item->manifest-entry item) (define (store-item->manifest-entry item)
\"Return a manifest entry for ITEM, a \\\"/gnu/store/...\\\" file name.\" \"Return a manifest entry for ITEM, a \\\"/gnu/store/...\\\" file name.\"
(let-values (((name version) (let-values (((name version)
@ -423,6 +425,7 @@ in the Guix store"
(version version) (version version)
(output \"out\") ;XXX: wild guess (output \"out\") ;XXX: wild guess
(item item)))) (item item))))
(manifest-add (manifest-add
(packages->manifest (packages->manifest
(list coreutils (list coreutils
@ -476,7 +479,7 @@ guix environment --ad-hoc --container --no-cwd --network \\
--expose=/sys/devices \\ --expose=/sys/devices \\
--expose=/dev/dri \\ --expose=/dev/dri \\
--share=/dev/shm \\ --share=/dev/shm \\
-m \"" out "/etc/manifest\" \\ -m \"" manifest-path "\" \\
\"${shell_command[@]}\"\n")) \"${shell_command[@]}\"\n"))
(chmod sandbox #o555) (chmod sandbox #o555)