[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/76: gnu: vulkan-loader: Fix include path location.
From: |
guix-commits |
Subject: |
01/76: gnu: vulkan-loader: Fix include path location. |
Date: |
Mon, 27 Sep 2021 10:18:07 -0400 (EDT) |
mothacehe pushed a commit to branch wip-gnome40
in repository guix.
commit 9ab022ad6b668bf5447c5ca1d754e126d7306fc8
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Wed Sep 22 09:59:48 2021 +0000
gnu: vulkan-loader: Fix include path location.
* gnu/packages/vulkan.scm (vulkan-loader)[arguments]<#:configure-flags>:
Point
to the vulkan-headers package that contains the include files.
[native-inputs]: Move vulkan-headers from here ...
[inputs]: ... to here.
---
gnu/packages/vulkan.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index ac91f84..b3f20fd 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix gexp)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
@@ -222,7 +224,14 @@ interpretation of the specifications for these languages.")
"15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv"))))
(build-system cmake-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
+ `(#:configure-flags
+ ,#~(list
+ (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
+ #$(this-package-input "vulkan-headers"))
+ (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
+ #$(this-package-input "vulkan-headers")
+ "/include"))
+ #:phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-googletest
(lambda* (#:key inputs #:allow-other-keys)
(let ((gtest (assoc-ref inputs "googletest:source")))
@@ -243,8 +252,9 @@ interpretation of the specifications for these languages.")
("libxrandr" ,libxrandr)
("pkg-config" ,pkg-config)
("python" ,python)
- ("vulkan-headers" ,vulkan-headers)
("wayland" ,wayland)))
+ (inputs
+ `(("vulkan-headers" ,vulkan-headers)))
(home-page
"https://github.com/KhronosGroup/Vulkan-Loader")
(synopsis "Khronos official ICD loader and validation layers for Vulkan")
- branch wip-gnome40 created (now 4687e65), guix-commits, 2021/09/27
- 02/76: gnu: Add gtk., guix-commits, 2021/09/27
- 04/76: gnu: gnome-backgrounds: Update to 40.1., guix-commits, 2021/09/27
- 05/76: gnu: gnome-screenshot: Update to 40.0., guix-commits, 2021/09/27
- 03/76: gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2., guix-commits, 2021/09/27
- 01/76: gnu: vulkan-loader: Fix include path location.,
guix-commits <=
- 06/76: gnu: gnote: Update to 40.2., guix-commits, 2021/09/27
- 07/76: gnu: gnome-shell-extensions: Update to 40.4., guix-commits, 2021/09/27
- 12/76: gnu: gnome-font-viewer: Update to 40.0., guix-commits, 2021/09/27
- 13/76: gnu: libportal: Update to 0.4., guix-commits, 2021/09/27
- 11/76: gnu: gnome-disk-utility: Update to 40.2., guix-commits, 2021/09/27
- 08/76: gnu: gnome-menus: Update to 3.36.0., guix-commits, 2021/09/27
- 10/76: gnu: gnome-desktop: Update to 40.4., guix-commits, 2021/09/27
- 09/76: gnu: gnome-user-docs: Update to 40.5., guix-commits, 2021/09/27
- 14/76: gnu: Add libadwaita., guix-commits, 2021/09/27
- 17/76: gnu: gnome-system-monitor: Update to 40.1., guix-commits, 2021/09/27