[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/416: gnu: vulkan-loader: Remove input labels.
From: |
guix-commits |
Subject: |
48/416: gnu: vulkan-loader: Remove input labels. |
Date: |
Fri, 14 Apr 2023 15:25:16 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit c684e5f4e46b8ee945e195e957a2e7e1ed5331bc
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 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
- 53/416: gnu: modem-manager: Update to 1.18.12., (continued)
- 53/416: gnu: modem-manager: Update to 1.18.12., guix-commits, 2023/04/14
- 39/416: gnu: perl-http-message: Update to 6.37., guix-commits, 2023/04/14
- 54/416: gnu: libcdio: Fix test failure with glibc 2.36., guix-commits, 2023/04/14
- 58/416: gnu: sdl2-mixer: Add upstream-name property., guix-commits, 2023/04/14
- 69/416: gnu: rust-xcb: Add 1.2.0., guix-commits, 2023/04/14
- 20/416: gnu: libvpx: Update to 1.12.0., guix-commits, 2023/04/14
- 28/416: gnu: vulkan-loader: Update to sdk-1.3.231.1., guix-commits, 2023/04/14
- 40/416: gnu: perl-try-tiny: Update to 0.31., guix-commits, 2023/04/14
- 43/416: gnu: perl-io-socket-ssl: Update to 2.075., guix-commits, 2023/04/14
- 44/416: gnu: libpipeline: Update to 1.5.6., guix-commits, 2023/04/14
- 48/416: gnu: vulkan-loader: Remove input labels.,
guix-commits <=
- 55/416: gnu: sdl2: Update to 2.26.0., guix-commits, 2023/04/14
- 66/416: gnu: libva: Update to 2.16.0., guix-commits, 2023/04/14
- 67/416: gnu: rust-pkg-config: Update to 0.3.26., guix-commits, 2023/04/14
- 68/416: gnu: rust-x11: Update to 2.20.1., guix-commits, 2023/04/14
- 77/416: gnu: rust-bytemuck-derive: Update to 1.3.0., guix-commits, 2023/04/14
- 86/416: gnu: rust-syn: Update to 1.0.105., guix-commits, 2023/04/14
- 42/416: gnu: perl-http-daemon: Update to 6.14., guix-commits, 2023/04/14
- 73/416: gnu: rust-crypto-common: Update to 0.1.6., guix-commits, 2023/04/14
- 74/416: gnu: rust-cookie: Move versions closer together., guix-commits, 2023/04/14
- 75/416: gnu: rust-const-oid: Add 0.9.1., guix-commits, 2023/04/14