diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-20 20:56:27 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:10:59 -0400 |
| commit | c684e5f4e46b8ee945e195e957a2e7e1ed5331bc (patch) | |
| tree | 04c43a41db7b2078079d943b1d0ddcdb04b4f113 | |
| parent | 4daa9c353f2e9261ca74a3ffc7ceaf685b2f21c1 (diff) | |
| download | guix-c684e5f4e46b8ee945e195e957a2e7e1ed5331bc.tar guix-c684e5f4e46b8ee945e195e957a2e7e1ed5331bc.tar.gz | |
gnu: vulkan-loader: Remove input labels.
* gnu/packages/vulkan.scm (vulkan-loader)[native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-DIRECTORY instead of label. While at it remove
use of THIS-PACKAGE-INPUT.
| -rw-r--r-- | gnu/packages/vulkan.scm | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1f6aae5585..8d2c93c5dc 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -225,26 +225,29 @@ interpretation of the specifications for these languages.") "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - ,#~(list - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - #$(this-package-input "vulkan-headers")) - (string-append "-DGOOGLETEST_INSTALL_DIR=" - (getcwd) "/source/external/googletest") - "-DBUILD_TESTS=ON") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-googletest - (lambda* (#:key inputs #:allow-other-keys) - (let ((gtest (assoc-ref inputs "googletest:source"))) - (when gtest - (copy-recursively gtest "external/googletest")) - #t)))))) + (list + #:configure-flags + #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs "include/vulkan")))) + (string-append "-DGOOGLETEST_INSTALL_DIR=" + (getcwd) "/source/external/googletest") + "-DBUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((gtest (search-input-directory (or native-inputs inputs) + "googletest"))) + (copy-recursively (dirname gtest) + "external/googletest"))))))) (native-inputs - `(("googletest:source" ,(package-source googletest)) - ("libxrandr" ,libxrandr) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("wayland" ,wayland))) + (list (package-source googletest) + libxrandr + pkg-config + python + wayland)) (inputs (list vulkan-headers)) (home-page |