[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: vulkan-loader: Remove input labels.
From: |
guix-commits |
Subject: |
02/06: gnu: vulkan-loader: Remove input labels. |
Date: |
Mon, 21 Nov 2022 03:00:53 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit b1f29b1124a08f67aa31dbe991b50ae91ef08174
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Nov 20 20:56:27 2022 +0100
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.
---
gnu/packages/vulkan.scm | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 49c7e2039f..550d594731 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -228,26 +228,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
- branch staging updated (c37a426038 -> bd4869c7fc), guix-commits, 2022/11/21
- 01/06: gnu: vulkan-loader: Update to 1.3.232., guix-commits, 2022/11/21
- 02/06: gnu: vulkan-loader: Remove input labels.,
guix-commits <=
- 03/06: gnu: MariaDB: Update to 10.10.2., guix-commits, 2022/11/21
- 04/06: gnu: MariaDB: Remove input labels., guix-commits, 2022/11/21
- 06/06: gnu: NSS: Update to 3.85., guix-commits, 2022/11/21
- 05/06: gnu: NSPR: Update to 4.35., guix-commits, 2022/11/21