Compare commits
7 Commits
extend-wra
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
2ed247c0c8 | ||
|
8327932008 | ||
|
0d9c22d1c4 | ||
|
794aa4eff8 | ||
|
9f06b18aef | ||
|
3df2e2ccc4 | ||
|
c385e67f7d |
|
@ -81,18 +81,23 @@
|
|||
;; Use the more standard lib directory for everything.
|
||||
(rename-file "opt/" "lib")
|
||||
;; Remove unneeded files.
|
||||
(delete-file-recursively "usr")
|
||||
;; Fix the .desktop file binary location.
|
||||
(substitute* '("share/applications/heroic.desktop")
|
||||
(("/opt/Heroic/")
|
||||
(string-append #$output "/bin/")))))
|
||||
(delete-file-recursively "usr")))
|
||||
;; Fix the .desktop file "Exec" line to just be "heroic" in
|
||||
;; order for this desktop file to be useful to launch heroic in
|
||||
;; the container (heroic package) as well.
|
||||
(add-after 'patch-dot-desktop-files 'fix-desktop-file
|
||||
(lambda _
|
||||
(substitute*
|
||||
(string-append #$output "/share/applications/heroic.desktop")
|
||||
(("Exec=.*/heroic") "Exec=heroic"))))
|
||||
(delete 'patch-dot-desktop-files)
|
||||
(add-after 'install 'symlink-binary-file
|
||||
(lambda _
|
||||
(mkdir-p (string-append #$output "/bin"))
|
||||
(symlink (string-append #$output "/lib/Heroic/heroic")
|
||||
(string-append #$output "/bin/heroic")))))))
|
||||
(home-page "https://heroicgameslauncher.com")
|
||||
(synopsis "A Native GOG, Amazon and Epic Games Launcher")
|
||||
(synopsis "Native GOG, Amazon and Epic Games Launcher")
|
||||
(description "Heroic is an Open Source Game Launcher. Right now it supports launching
|
||||
games from the Epic Games Store using Legendary, GOG Games using our custom
|
||||
implementation with gogdl and Amazon Games using Nile.")
|
||||
|
@ -164,6 +169,12 @@ implementation with gogdl and Amazon Games using Nile.")
|
|||
("fontconfig" ,fontconfig) ; Required for steam client.
|
||||
("file" ,file) ; Used for steam installation.
|
||||
("find" ,findutils) ; Required at least for some logging.
|
||||
("font-google-noto" ,font-google-noto) ; Not required but to match following fonts.
|
||||
;; These next three fonts are to cover emoji and Chinese/Japanese/Korean
|
||||
;; and related scripts.
|
||||
("font-google-noto-emoji" ,font-google-noto-emoji)
|
||||
("font-google-noto-sans-cjk" ,font-google-noto-sans-cjk)
|
||||
("font-google-noto-serif-cjk" ,font-google-noto-serif-cjk)
|
||||
("freetype" ,freetype) ; Required for steam login.
|
||||
("gawk" ,gawk)
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; Required for steam tray icon.
|
||||
|
|
|
@ -279,7 +279,7 @@ distribution with custom settings and new features. It's built to provide a
|
|||
stable, responsive and smooth desktop experience.")))
|
||||
|
||||
;; Linux-XanMod sources
|
||||
(define-public linux-xanmod-version "6.12.10")
|
||||
(define-public linux-xanmod-version "6.12.13")
|
||||
(define-public linux-xanmod-revision "xanmod1")
|
||||
(define-public linux-xanmod-source
|
||||
(make-linux-xanmod-source
|
||||
|
@ -287,7 +287,7 @@ stable, responsive and smooth desktop experience.")))
|
|||
linux-xanmod-revision
|
||||
#:xanmod-branch "main"
|
||||
#:kernel-hash (base32 "1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi")
|
||||
#:xanmod-hash (base32 "1szi250nhj5j9km8q0z32hdf38kkl6kry5jh71dpc1ar0x1b26bd")))
|
||||
#:xanmod-hash (base32 "18a7hbm7gvf6b7wr84rszmpl1yb3mdgj2plv5627mv09dn87lvz2")))
|
||||
|
||||
(define-public linux-xanmod-lts-version "6.6.72")
|
||||
(define-public linux-xanmod-lts-revision "xanmod1")
|
||||
|
@ -318,14 +318,14 @@ stable, responsive and smooth desktop experience.")))
|
|||
(define-public linux-firmware
|
||||
(package
|
||||
(name "linux-firmware")
|
||||
(version "20250109")
|
||||
(version "20250211")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
|
||||
"linux-firmware-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w0mclq20jcam6xl6jbil3n9vw74nqlvw0k7dkslnfck8y7v6b51"))))
|
||||
"0z998nxplnc22nbj3yzdyjjs433p92rzvq2x5i9rv0xzjxc39q9d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
|
|
|
@ -89,6 +89,9 @@
|
|||
"libnvidia-egl-gbm\\.so\\."
|
||||
;; egl-wayland
|
||||
"libnvidia-egl-wayland\\.so\\."
|
||||
;; egl-x11
|
||||
"libnvidia-egl-xcb\\.so\\."
|
||||
"libnvidia-egl-xlib\\.so\\."
|
||||
;; libglvnd
|
||||
"libEGL\\.so\\."
|
||||
"libGL\\.so\\."
|
||||
|
@ -441,29 +444,60 @@ mainly used as a dependency of other packages. For user-facing purpose, use
|
|||
(package
|
||||
(inherit nvidia-driver)
|
||||
(name "nvidia-driver-beta")
|
||||
(version "565.57.01")
|
||||
(version "570.86.16")
|
||||
(source (nvidia-source
|
||||
version "0yic33xx1b3jbgciphlwh6zqfj21vx9439zm0j45wf2yb17fksvf"))
|
||||
version "1mfbc59g5v1c6dqissg1mfawvaknqrr7r985214py92lnr5ylqs5"))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments nvidia-driver)
|
||||
((#:install-plan plan)
|
||||
#~(cons '("nvidia_icd_vksc.json" "etc/vulkansc/icd.d/")
|
||||
#$plan))
|
||||
#~(append
|
||||
#$plan
|
||||
'(("." "share/egl/egl_external_platform.d/" #:include-regexp ("(xcb|xlib)\\.json$"))
|
||||
("nvidia_icd_vksc.json" "etc/vulkansc/icd.d/")
|
||||
("sandboxutils-filelist.json" "share/nvidia/files.d/"))))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'create-misc-files 'create-misc-files-for-beta
|
||||
(lambda _
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; EGL external platform configuraiton
|
||||
(substitute* '("20_nvidia_xcb.json"
|
||||
"20_nvidia_xlib.json")
|
||||
(("libnvidia-egl-(xcb|xlib)\\.so\\.." all)
|
||||
(search-input-file inputs (string-append "lib/" all))))
|
||||
;; VulkanSC ICD configuration
|
||||
(substitute* "nvidia_icd_vksc.json"
|
||||
(("libnvidia-vksc-core\\.so\\.." all)
|
||||
(string-append #$output "/lib/" all)))))
|
||||
(add-after 'add-architecture-to-filename 'add-architecture-to-filename-for-beta
|
||||
(lambda _
|
||||
(for-each
|
||||
(lambda (path)
|
||||
(let* ((out #$output)
|
||||
(system #$(or (%current-target-system)
|
||||
(%current-system)))
|
||||
(dash (string-index system #\-))
|
||||
(arch (string-take system dash))
|
||||
|
||||
(dot (string-index-right path #\.))
|
||||
(base (string-take path dot))
|
||||
(ext (string-drop path (+ 1 dot))))
|
||||
;; <...>/nvidia.icd -> <...>/nvidia.x86_64.icd
|
||||
;; <...>/nvidia_icd.json -> <...>/nvidia_icd.x86_64.json
|
||||
(rename-file
|
||||
(string-append out path)
|
||||
(string-append out base "." arch "." ext))))
|
||||
'("/share/egl/egl_external_platform.d/20_nvidia_xcb.json"
|
||||
"/share/egl/egl_external_platform.d/20_nvidia_xlib.json"))))
|
||||
(add-after 'install-commands 'install-commands-for-beta
|
||||
(lambda _
|
||||
(when (string-match
|
||||
"x86_64-linux"
|
||||
(or #$(%current-target-system) #$(%current-system)))
|
||||
(install-file "nvidia-pcc"
|
||||
(string-append #$output "/bin")))))))))))
|
||||
(string-append #$output "/bin")))))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs nvidia-driver)
|
||||
(prepend egl-x11)))))
|
||||
|
||||
(define-public nvidia-libs
|
||||
(deprecated-package "nvidia-libs" nvidia-driver))
|
||||
|
@ -686,10 +720,10 @@ configuration, creating application profiles, gpu monitoring and more.")
|
|||
(package
|
||||
(inherit nvidia-settings)
|
||||
(name "nvidia-settings-beta")
|
||||
(version "565.57.01")
|
||||
(version "570.86.16")
|
||||
(source (nvidia-settings-source
|
||||
name version
|
||||
"006my5a69689wkzjcg3k1y35ifmizfyfj4n7f02naxhbgrxq9fqz"))
|
||||
"0gs5iml7yp5sd6vybj3alb6cg06ylljn4h7iwp2i1jhkms3nmfzn"))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs nvidia-settings)
|
||||
(prepend vulkan-headers)))))
|
||||
|
|
|
@ -570,7 +570,9 @@ application."
|
|||
;; games). Wait to set this inside the container to not cause
|
||||
;; issues on foreign distros, see
|
||||
;; <https://gitlab.com/nonguix/nonguix/-/issues/303>
|
||||
(setenv "LD_LIBRARY_PATH" "/lib64:/lib:/lib64/vdpau:/lib/vdpau")
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append "/lib64:/lib:/lib64/nss:/lib/nss:"
|
||||
"/lib64/vdpau:/lib/vdpau"))
|
||||
|
||||
;; Process FHS-specific command line options.
|
||||
(let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec))
|
||||
|
|
Loading…
Reference in New Issue
Block a user