mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: vulkan-loader: Update URL and change name.
* gnu/packages/emulators.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/games.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/video.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/vulkan.scm (vulkan-loader): Rename from 'vulkan-icd-loader' to 'vulkan-loader'. Update URL and hash. * gnu/packages/wine.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'.
This commit is contained in:
parent
7ea56cdec0
commit
e6fcf903ec
5 changed files with 13 additions and 13 deletions
|
@ -156,7 +156,7 @@ (define-public dolphin-emu
|
|||
(string-append (assoc-ref inputs "font-wqy-microhei")
|
||||
"/share/fonts/truetype/wqy-microhei.ttc"))
|
||||
(libvulkan
|
||||
(string-append (assoc-ref inputs "vulkan-icd-loader")
|
||||
(string-append (assoc-ref inputs "vulkan-loader")
|
||||
"/lib/libvulkan.so")))
|
||||
(chdir "docs")
|
||||
(invoke "bash" "-c" "g++ -O2 -std=c++11 $(freetype-config \
|
||||
|
@ -219,7 +219,7 @@ (define-public dolphin-emu
|
|||
("sfml" ,sfml)
|
||||
("soil" ,soil)
|
||||
("soundtouch" ,soundtouch)
|
||||
("vulkan-icd-loader" ,vulkan-icd-loader)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("wxwidgets" ,wxwidgets-gtk2-3.1)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://dolphin-emu.org/")
|
||||
|
@ -1069,7 +1069,7 @@ (define-public retroarch
|
|||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(etc (string-append out "/etc"))
|
||||
(vulkan (assoc-ref inputs "vulkan-icd-loader")))
|
||||
(vulkan (assoc-ref inputs "vulkan-loader")))
|
||||
;; Hard-code the path to libvulkan.so.
|
||||
(substitute* "gfx/common/vulkan_common.c"
|
||||
(("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
|
||||
|
@ -1096,7 +1096,7 @@ (define-public retroarch
|
|||
("qtbase" ,qtbase)
|
||||
("sdl" ,sdl2)
|
||||
("udev" ,eudev)
|
||||
("vulkan-icd-loader" ,vulkan-icd-loader)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("wayland" ,wayland)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
|
|
|
@ -4467,7 +4467,7 @@ (define-public vkquake
|
|||
(arguments
|
||||
`(#:make-flags
|
||||
(let ((vulkanlib (string-append (assoc-ref %build-inputs
|
||||
"vulkan-icd-loader") "/lib")))
|
||||
"vulkan-loader") "/lib")))
|
||||
(list "CC=gcc"
|
||||
"MP3LIB=mpg123"
|
||||
"USE_CODEC_FLAC=1"
|
||||
|
@ -4480,7 +4480,7 @@ (define-public vkquake
|
|||
(add-after 'unpack 'fix-makefile-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((vulkan (assoc-ref %build-inputs
|
||||
"vulkan-icd-loader"))
|
||||
"vulkan-loader"))
|
||||
(out (assoc-ref outputs "out")))
|
||||
(mkdir-p (string-append out "/bin"))
|
||||
(substitute* "Quake/Makefile" ((" /usr")
|
||||
|
@ -4491,7 +4491,7 @@ (define-public vkquake
|
|||
#t))))
|
||||
,@(strip-keyword-arguments '(#:make-flags #:phases)
|
||||
(package-arguments quakespasm))))
|
||||
(inputs `(("vulkan-icd-loader" ,vulkan-icd-loader)
|
||||
(inputs `(("vulkan-loader" ,vulkan-loader)
|
||||
,@(package-inputs quakespasm)))
|
||||
(description "vkquake is a modern engine for id software's Quake 1.
|
||||
It includes support for 64 bit CPUs, custom music playback, a new sound driver,
|
||||
|
|
|
@ -1119,7 +1119,7 @@ (define-public mpv
|
|||
("pulseaudio" ,pulseaudio)
|
||||
("rsound" ,rsound)
|
||||
("shaderc" ,shaderc)
|
||||
("vulkan-icd-loader" ,vulkan-icd-loader)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("waf" ,python-waf)
|
||||
("wayland" ,wayland)
|
||||
("wayland-protocols" ,wayland-protocols)
|
||||
|
|
|
@ -157,19 +157,19 @@ (define-public glslang
|
|||
;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0.
|
||||
license:asl2.0)))))
|
||||
|
||||
(define-public vulkan-icd-loader
|
||||
(define-public vulkan-loader
|
||||
(package
|
||||
(name "vulkan-icd-loader")
|
||||
(name "vulkan-loader")
|
||||
(version "1.1.73.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/"
|
||||
"https://github.com/KhronosGroup/Vulkan-Loader/"
|
||||
"archive/sdk-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb"))))
|
||||
"0lvdpy6ybx5h7w15m9s2n9q3167q618clra2k7yi2cbm397ci4hn"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".
|
||||
|
|
|
@ -285,7 +285,7 @@ (define-public wine-staging
|
|||
("python" ,python)
|
||||
("sdl2" ,sdl2)
|
||||
("util-linux" ,util-linux) ; for hexdump
|
||||
("vulkan-icd-loader" ,vulkan-icd-loader)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("wine-staging-patchset-data" ,wine-staging-patchset-data)
|
||||
,@(package-inputs wine)))
|
||||
(arguments
|
||||
|
|
Loading…
Reference in a new issue