Commit Graph

56 Commits

Author SHA1 Message Date
Fabian Möller
0fe70e7fd4
vulkan-loader: fix pkg-config include directory
With the last update the pkg-config file was changed to cmake variables,
which made substituteInPlace ineffective.

Fixes #108766
2021-01-22 12:25:17 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Joe Hermaszewski
cbc4bd9971 vulkan: 1.2.141 -> 1.2.162
Also improve metadata for vulkan-validation-layers
2021-01-03 11:03:42 +00:00
Doron Behar
0826f2efae
Merge pull request #94049 from CajuM/vulkan-up 2020-10-15 09:53:35 +03:00
Câju Mihai-Drosi
4884f330b5 vulkan-loader: 1.2.131.2 -> 1.2.141.0 2020-09-24 08:19:41 +03:00
Anthony Cowley
4c5f19992f vulkan-loader: fix pkgconfig libdir path 2020-09-23 12:12:42 -04:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Matthew Bauer
f8347478a8 vulkan-loader: make cmake a native build input 2020-04-06 16:36:21 -04:00
Benjamin Saunders
b5533631ce vulkan-loader: use vulkan-headers include path in pkgconfig file 2020-03-12 10:31:51 -07:00
Benjamin Saunders
eb250b9a00 vulkan-loader: 1.1.144.0 -> 1.2.131.2 2020-02-11 19:11:32 +01:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Ambroz Bizjak
1bba961e2a libglvnd, ocl-icd, vulkan-loader: Remove addOpenGLRunpath where not needed.
For APIs that use driver config files, the config files should point to libraries using absolute paths, so `RUNPATH` should be unnecessary. It is still needed for `libGLX` because that does not use config files but the dispatch library receives just a vendor name from the X server.
2019-08-18 21:29:42 +03:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Jonathan Ringer
19d91206e7 vulkan-*: 1.1.106 -> 1.1.114.0 2019-08-08 00:57:53 -07:00
Ambroz Bizjak
bc96146e75 vulkan-loader: Always include /run/opengl-driver(-32)/share in search path.
Even though FALLBACK_DATA_DIRS is set to include this, it only applies when XDG_DATA_DIRS is not defined, so the NixOS opengl.nix module still had to include these in the search path. Use a simple patch to force a default search path, consulted after all other search paths.

Note that FALLBACK_DATA_DIRS is no longer set, and the default (/usr/local/share:/usr/share) applies.
2019-06-08 20:23:54 +02:00
Ambroz Bizjak
1860e506e7 libglvnd, ocl-icd, vulkan-loader: Add driver library paths to RUNPATH.
Previously we were relying on LD_LIBRARY_PATH to discover driver libraries (libGL, ligGLX, libEGL, OpenCL and Vulkan). This has the problem that setuid programs (in particular VirtualBox) ignore LD_LIBRARY_PATH. Fix it by setting RUNPATH in various dispatch libraries.

This is not needed for libvdpau because it is already configured to look for libraries in the driver paths.

Fixes https://github.com/NixOS/nixpkgs/issues/22760.
2019-05-22 18:30:05 +02:00
Alexander V. Nikolaev
28846204c2 vulkan-loader: 1.1.101.6 -> 1.1.106 2019-04-18 21:40:45 +03:00
Benjamin Saunders
b11558669e vulkan-loader: remove headers
These now live in vulkan-headers.
2019-03-30 15:50:08 -07:00
Benjamin Saunders
ea4eeb3cd0 vulkan-loader: 1.1.85 -> 1.1.101.0 2019-03-20 17:51:35 -07:00
Yegor Timoshenko
4d93668052
vulkan-loader: lock rev, update sha256 after bump
See: https://git.io/fxRIA
2018-10-13 18:00:07 +00:00
Lengyel Balazs
bae3fd3d83 vulkan-loader: update to match vulkan-headers at 1.1.85 2018-10-13 13:05:34 +02:00
Benjamin Saunders
b830df0ea9 vulkan-loader: 1.1.77.0 -> 1.1.82.0 2018-08-29 18:58:43 -07:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Matthew Bauer
c7c34f1261
Merge pull request #42638 from Ralith/vulkan
Vulkan updates
2018-06-28 22:27:01 -04:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Benjamin Saunders
937d6acb80 vulkan-loader: 1.1.70.0 -> 1.1.77.0 2018-06-26 20:38:01 -07:00
xeji
599ecd583f
Merge pull request #39094 from Ralith/vulkan
vulkan-loader: fix broken symlink in output
2018-05-02 05:45:42 +02:00
Benjamin Saunders
d1f7c51d17 vulkan-loader: fix broken symlink in output 2018-04-17 19:56:52 -07:00
Frederik Rietdijk
23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Nikolay Amiantov
6bf1421f13 treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Benjamin Saunders
3808369103 vulkan-loader: 1.0.61.1 -> 1.1.70.0
Lockstep glslang and spirv-tools updates included
2018-03-22 21:41:04 -07:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Benjamin Saunders
775d35d0b2 vulkan-loader: 1.0.42.2 -> 1.0.61.1 2017-12-13 11:18:11 -08:00
John Ericson
f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Michael Raskin
d997f80a5f Merge pull request #24381 from ljli/vulkan-loader-demos
vulkan-loader: demos: fix cube/cubepp
2017-05-01 07:34:46 +02:00
Benjamin Saunders
201960922c vulkan-loader: 1.0.39.1 -> 1.0.42.2 2017-04-01 12:28:59 -07:00
Leon Isenberg
df94900353 vulkan-loader: demos: fix cube/cubepp 2017-03-27 10:42:44 +02:00
Benjamin Saunders
bfdfd6c3df vulkan-loader: fix search paths in suid processes
Fixes #22990
2017-02-20 01:39:48 +03:00
Benjamin Saunders
dbd4a35060 vulkan-loader: 1.0.26.0 -> 1.0.39.1 2017-01-31 04:47:19 +03:00
Nikolay Amiantov
e17b483669 glslang, spirv-tools, vulkan-loader: add metainformation 2017-01-04 12:57:22 +03:00
David McFarland
6bf27c2cae vulkan-loader: allow validation layers to be enabled
The loader now uses XDK_DATA_DIRS to find drivers and layers.
2016-11-13 12:44:27 -04:00
David McFarland
1624507eaf vulkan-loader: allow 32-bit builds 2016-11-13 12:44:27 -04:00
David McFarland
8fe96a1926 vulkan-loader: package headers, layers and demos 2016-11-13 12:44:27 -04:00