diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/mesa/opencl.patch | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/opencl.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/opencl.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/opencl.patch b/nixpkgs/pkgs/development/libraries/mesa/opencl.patch index fb4da5cf7a0a..cd27f0a2e86f 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/opencl.patch +++ b/nixpkgs/pkgs/development/libraries/mesa/opencl.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 172c64a7c70..05961e56926 100644 +index fbb0b29322d..b4825056449 100644 --- a/meson.build +++ b/meson.build -@@ -1900,7 +1900,7 @@ endif +@@ -1805,7 +1805,7 @@ endif dep_clang = null_dep if with_clc @@ -12,12 +12,12 @@ index 172c64a7c70..05961e56926 100644 dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) diff --git a/meson_options.txt b/meson_options.txt -index 6f307018815..ab84eb1006c 100644 +index e885ba61a8a..591ed957c85 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -18,6 +18,12 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. +@@ -23,6 +23,12 @@ option( + description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY', + ) +option( + 'clang-libdir', @@ -26,10 +26,10 @@ index 6f307018815..ab84eb1006c 100644 + description : 'Locations to search for clang libraries.' +) option( - 'platforms', - type : 'array', + 'android-stub', + type : 'boolean', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index db3586bd7fb..4d914206d21 100644 +index 7c14135898e..74dc6850603 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') @@ -48,19 +48,19 @@ index db3586bd7fb..4d914206d21 100644 output : 'mesa.icd', - install : true, + install : false, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build -index a968dee52db..69475cf3133 100644 +index b2963fe6dfa..99d6d801b94 100644 --- a/src/gallium/targets/rusticl/meson.build +++ b/src/gallium/targets/rusticl/meson.build -@@ -58,7 +58,7 @@ configure_file( +@@ -76,7 +76,7 @@ configure_file( configuration : _config, input : 'rusticl.icd.in', output : 'rusticl.icd', - install : true, + install : false, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - |