diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-06 22:43:37 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-06 22:43:37 +0200 |
| commit | 116ca65b583ba4e404289f1481dc3a3ffef1c3dd (patch) | |
| tree | 79796424eb21443c76594304162b6629c3a8a54e /gnu/packages/emulators.scm | |
| parent | 477ee222aa796257b5f32966da662e76fe706332 (diff) | |
| parent | 25133ca172d7dd436c4c08055d18f1a393037dbb (diff) | |
| download | patches-116ca65b583ba4e404289f1481dc3a3ffef1c3dd.tar patches-116ca65b583ba4e404289f1481dc3a3ffef1c3dd.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 48f359c5bf..8fbb804e57 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -156,7 +156,7 @@ (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 @@ ("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/") @@ -1072,7 +1072,7 @@ emulation community. It provides highly accurate emulation.") (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"))) @@ -1099,7 +1099,7 @@ emulation community. It provides highly accurate emulation.") ("qtbase" ,qtbase) ("sdl" ,sdl2) ("udev" ,eudev) - ("vulkan-icd-loader" ,vulkan-icd-loader) + ("vulkan-loader" ,vulkan-loader) ("wayland" ,wayland) ("zlib" ,zlib))) (native-inputs |