mesa: 24.3.4 -> 25.0.0 (#383432)

authored by K900 and committed by GitHub ffe8d1b1 0ce9de03

+129 -168
+1 -1
pkgs/applications/emulators/wine/base.nix
··· 98 98 ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] 99 99 ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] 100 100 ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] 101 - ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] 101 + ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.libdrm ] 102 102 ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks 103 103 ++ lib.optionals (x11Support) (with pkgs.xorg; [ 104 104 libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm
+2 -2
pkgs/applications/video/kodi/unwrapped.nix
··· 18 18 , libcrossguid, libmicrohttpd 19 19 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1 20 20 , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson 21 - , lirc, mesa 21 + , lirc, mesa-gl-headers 22 22 , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp 23 23 , dbusSupport ? true, dbus 24 24 , joystickSupport ? true, cwiid ··· 122 122 bluez giflib glib harfbuzz lcms2 libpthreadstubs 123 123 ffmpeg flatbuffers fstrcmp rapidjson 124 124 lirc 125 - mesa # uses eglext_angle.h, which is not provided by glvnd 125 + mesa-gl-headers 126 126 ] 127 127 ++ lib.optionals x11Support [ 128 128 libX11 xorgproto libXt libXmu libXext.dev libXdmcp
+2 -2
pkgs/by-name/he/hey-mail/package.nix
··· 21 21 wrapGAppsHook3, 22 22 writeScript, 23 23 atk, 24 - mesa, 24 + libgbm, 25 25 cups, 26 26 systemd, 27 27 alsa-lib, ··· 53 53 libxkbcommon 54 54 libGL 55 55 atk 56 - mesa 56 + libgbm 57 57 cups 58 58 systemd 59 59 alsa-lib
+4 -2
pkgs/by-name/ma/magpie/package.nix
··· 25 25 libXtst, 26 26 libinput, 27 27 libdrm, 28 + libgbm, 28 29 gsettings-desktop-schemas, 29 30 glib, 30 31 gtk3, ··· 32 33 pipewire, 33 34 libgudev, 34 35 libwacom, 35 - mesa, 36 + mesa-gl-headers, 36 37 meson, 37 38 nix-update-script, 38 39 validatePkgConfig, ··· 86 87 libXtst 87 88 libcap_ng 88 89 graphene 89 - mesa # actually uses eglmesaext 90 + mesa-gl-headers 90 91 ]; 91 92 92 93 nativeBuildInputs = [ ··· 114 115 gtk3 115 116 libcanberra 116 117 libdrm 118 + libgbm 117 119 libgudev 118 120 libinput 119 121 libstartup_notification
+4 -2
pkgs/by-name/mu/muffin/package.nix
··· 15 15 json-glib, 16 16 libcanberra, 17 17 libdrm, 18 + libgbm, 18 19 libgnomekbd, 19 20 libgudev, 20 21 libinput, ··· 24 25 libXdamage, 25 26 libxkbcommon, 26 27 libXtst, 27 - mesa, 28 + mesa-gl-headers, 28 29 meson, 29 30 ninja, 30 31 pipewire, ··· 84 85 gtk3 85 86 libcanberra 86 87 libdrm 88 + libgbm 87 89 libgnomekbd 88 90 libgudev 89 91 libinput ··· 104 106 json-glib 105 107 libXtst 106 108 graphene 107 - mesa # actually uses eglmesaext 109 + mesa-gl-headers 108 110 ]; 109 111 110 112 mesonFlags = [
+4 -2
pkgs/by-name/mu/mutter/package.nix
··· 36 36 libXau, 37 37 libinput, 38 38 libdrm, 39 + libgbm, 39 40 libei, 40 41 libdisplay-info, 41 42 gsettings-desktop-schemas, ··· 50 51 libwacom, 51 52 libSM, 52 53 xwayland, 53 - mesa, 54 + mesa-gl-headers, 54 55 meson, 55 56 gnome-settings-daemon, 56 57 xorgserver, ··· 101 102 propagatedBuildInputs = [ 102 103 # required for pkg-config to detect mutter-mtk 103 104 graphene 104 - mesa # actually uses eglmesaext 105 + mesa-gl-headers 105 106 ]; 106 107 107 108 nativeBuildInputs = [ ··· 133 134 harfbuzz 134 135 libcanberra 135 136 libdrm 137 + libgbm 136 138 libei 137 139 libdisplay-info 138 140 libGL
+4 -2
pkgs/by-name/mu/mutter46/package.nix
··· 34 34 libXau, 35 35 libinput, 36 36 libdrm, 37 + libgbm, 37 38 libei, 38 39 libdisplay-info, 39 40 gsettings-desktop-schemas, ··· 48 49 libwacom, 49 50 libSM, 50 51 xwayland, 51 - mesa, 52 + mesa-gl-headers, 52 53 meson, 53 54 gnome-settings-daemon, 54 55 xorgserver, ··· 97 98 propagatedBuildInputs = [ 98 99 # required for pkg-config to detect mutter-mtk 99 100 graphene 100 - mesa # actually uses eglmesaext 101 + mesa-gl-headers 101 102 ]; 102 103 103 104 nativeBuildInputs = [ ··· 128 129 harfbuzz 129 130 libcanberra 130 131 libdrm 132 + libgbm 131 133 libei 132 134 libdisplay-info 133 135 libgudev
+2 -10
pkgs/by-name/or/orca-slicer/package.nix
··· 27 27 hicolor-icon-theme, 28 28 ilmbase, 29 29 libpng, 30 - mesa, 31 30 mpfr, 32 31 nlopt, 33 32 opencascade-occt_7_6, ··· 107 106 hicolor-icon-theme 108 107 ilmbase 109 108 libpng 110 - mesa 111 - mesa.osmesa 112 - mesa.drivers 113 109 mpfr 114 110 nlopt 115 111 opencascade-occt_7_6 ··· 129 125 ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch 130 126 # Link opencv_core and opencv_imgproc instead of opencv_world 131 127 ./patches/dont-link-opencv-world-orca.patch 128 + # Don't link osmesa 129 + ./patches/no-osmesa.patch 132 130 # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged 133 131 # Allows disabling the update nag screen 134 132 (fetchpatch { ··· 169 167 170 168 NIX_LDFLAGS = toString [ 171 169 (lib.optionalString withSystemd "-ludev") 172 - "-L${mesa.osmesa}/lib" 173 - "-L${mesa.drivers}/lib" 174 170 "-L${boost186}/lib" 175 171 "-lboost_log" 176 172 "-lboost_log_setup" ··· 194 190 "-DBOOST_LOG_NO_LIB=OFF" 195 191 "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION" 196 192 "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed" 197 - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${mesa.drivers}/lib -Wl,-rpath,${mesa.osmesa}/lib" 198 193 "-DORCA_VERSION_CHECK_DEFAULT=OFF" 199 194 ]; 200 195 ··· 202 197 gappsWrapperArgs+=( 203 198 --prefix LD_LIBRARY_PATH : "$out/lib:${ 204 199 lib.makeLibraryPath [ 205 - mesa.drivers 206 - mesa.osmesa 207 200 glew 208 201 ] 209 202 }" 210 - --prefix LIBGL_DRIVERS_PATH : "${mesa.drivers}/lib/dri" 211 203 --set WEBKIT_DISABLE_COMPOSITING_MODE 1 212 204 ) 213 205 '';
+13
pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch
··· 1 + diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt 2 + index e695acd48..174e233e6 100644 3 + --- a/src/slic3r/CMakeLists.txt 4 + +++ b/src/slic3r/CMakeLists.txt 5 + @@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") 6 + FIND_LIBRARY(WAYLAND_EGL_LIBRARIES NAMES wayland-egl) 7 + FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client) 8 + find_package(CURL REQUIRED) 9 + - target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa) 10 + + target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES}) 11 + target_link_libraries(libslic3r_gui 12 + OpenGL::EGL 13 + ${WAYLAND_SERVER_LIBRARIES}
-2
pkgs/by-name/qq/qqmusic/package.nix
··· 21 21 libdbusmenu, 22 22 libglvnd, 23 23 libpulseaudio, 24 - mesa, 25 24 nspr, 26 25 nss, 27 26 pango, ··· 62 61 libdbusmenu 63 62 libglvnd 64 63 libpulseaudio 65 - mesa 66 64 nspr 67 65 nss 68 66 pango
+4 -2
pkgs/desktops/enlightenment/efl/default.nix
··· 27 27 jbig2dec, 28 28 libGL, 29 29 libdrm, 30 + libgbm, 30 31 libinput, 31 32 libjpeg, 32 33 libpng, ··· 40 41 libxkbcommon, 41 42 lua, 42 43 lz4, 43 - mesa, 44 + mesa-gl-headers, 44 45 mint-x-icons, 45 46 openjpeg, 46 47 openssl, ··· 91 92 libsndfile 92 93 libtiff 93 94 lz4 94 - mesa # actually uses eglmesaext 95 + mesa-gl-headers 95 96 openssl 96 97 systemd 97 98 udev ··· 118 119 hicolor-icon-theme # for the icon theme 119 120 jbig2dec 120 121 libdrm 122 + libgbm 121 123 libinput 122 124 libjpeg 123 125 libraw
+1
pkgs/development/libraries/arrayfire/default.nix
··· 245 245 chessai 246 246 twesterhout 247 247 ]; 248 + broken = true; 248 249 }; 249 250 }
+4 -2
pkgs/development/libraries/cogl/default.nix
··· 14 14 gobject-introspection, 15 15 wayland, 16 16 gnome, 17 - mesa, 17 + libgbm, 18 + mesa-gl-headers, 18 19 automake, 19 20 autoconf, 20 21 gstreamerSupport ? false, ··· 86 87 ] 87 88 ++ lib.optionals stdenv.hostPlatform.isLinux [ 88 89 wayland 89 - mesa # actually uses eglmesaext 90 + libgbm 91 + mesa-gl-headers 90 92 libGL 91 93 xorg.libXrandr 92 94 xorg.libXfixes
+2 -2
pkgs/development/libraries/mesa/common.nix
··· 5 5 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa 6 6 rec { 7 7 pname = "mesa"; 8 - version = "24.3.4"; 8 + version = "25.0.1"; 9 9 10 10 src = fetchFromGitLab { 11 11 domain = "gitlab.freedesktop.org"; 12 12 owner = "mesa"; 13 13 repo = "mesa"; 14 14 rev = "mesa-${version}"; 15 - hash = "sha256-1RUHbTgcCxdDrWjqB0EG4Ny/nwdjQHHpyPauiW/yogU="; 15 + hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; 16 16 }; 17 17 18 18 meta = {
-90
pkgs/development/libraries/mesa/cross_clc.patch
··· 1 - commit f063e9f74b45f34e4ac570a90901253bf8e64efd 2 - Author: Mary Guillemard <mary.guillemard@collabora.com> 3 - Date: 2024-12-02 09:11:35 +0100 4 - 5 - meson: Add mesa-clc and install-mesa-clc options 6 - 7 - Due to the cross build issues in current meson, we adds new options to 8 - allow mesa_clc and vtn_bindgen to be installed or searched on the 9 - system. 10 - 11 - Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com> 12 - Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> 13 - Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> 14 - Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32719> 15 - 16 - diff --git a/meson.build b/meson.build 17 - index de9c9af53a1..e37325ec176 100644 18 - --- a/meson.build 19 - +++ b/meson.build 20 - @@ -808,7 +808,7 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv') 21 - endif 22 - 23 - with_clover_spirv = with_gallium_clover and get_option('opencl-spirv') 24 - -with_clc = with_microsoft_clc or with_intel_clc or with_gallium_asahi or with_asahi_vk or with_gallium_rusticl or with_clover_spirv 25 - +with_clc = get_option('mesa-clc') != 'auto' or with_microsoft_clc or with_intel_clc or with_gallium_asahi or with_asahi_vk or with_gallium_rusticl 26 - 27 - dep_clc = null_dep 28 - if with_gallium_clover or with_clc 29 - diff --git a/meson_options.txt b/meson_options.txt 30 - index 79ee65e6094..8f22b36e5fb 100644 31 - --- a/meson_options.txt 32 - +++ b/meson_options.txt 33 - @@ -744,3 +744,20 @@ option( 34 - 'none', 'dri2' 35 - ], 36 - ) 37 - + 38 - +option( 39 - + 'mesa-clc', 40 - + type : 'combo', 41 - + value : 'auto', 42 - + choices : [ 43 - + 'enabled', 'system', 'auto' 44 - + ], 45 - + description : 'Build the mesa-clc compiler or use a system version.' 46 - +) 47 - + 48 - +option( 49 - + 'install-mesa-clc', 50 - + type : 'boolean', 51 - + value : false, 52 - + description : 'Install the mesa-clc compiler (if needed for cross builds).' 53 - +) 54 - diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build 55 - index 74767d08de2..4875d71ca21 100644 56 - --- a/src/compiler/clc/meson.build 57 - +++ b/src/compiler/clc/meson.build 58 - @@ -117,15 +117,20 @@ idep_mesaclc = declare_dependency( 59 - link_args : _idep_mesaclc_link_args, 60 - ) 61 - 62 - -prog_mesa_clc = executable( 63 - - 'mesa_clc', 64 - - ['mesa_clc.c'], 65 - - include_directories : [inc_include, inc_src], 66 - - c_args : [pre_args, no_override_init_args], 67 - - link_args : [ld_args_build_id], 68 - - dependencies : [idep_mesaclc, dep_llvm, dep_spirv_tools, idep_getopt], 69 - - # If we can run host binaries directly, just build mesa_clc for the host. 70 - - # Most commonly this happens when doing a cross compile from an x86_64 build 71 - - # machine to an x86 host 72 - - native : not meson.can_run_host_binaries(), 73 - -) 74 - +if get_option('mesa-clc') == 'system' 75 - + prog_mesa_clc = find_program('mesa_clc', native : true) 76 - +else 77 - + prog_mesa_clc = executable( 78 - + 'mesa_clc', 79 - + ['mesa_clc.c'], 80 - + include_directories : [inc_include, inc_src], 81 - + c_args : [pre_args, no_override_init_args], 82 - + link_args : [ld_args_build_id], 83 - + dependencies : [idep_mesaclc, dep_llvm, dep_spirv_tools, idep_getopt], 84 - + # If we can run host binaries directly, just build mesa_clc for the host. 85 - + # Most commonly this happens when doing a cross compile from an x86_64 build 86 - + # machine to an x86 host 87 - + native : not meson.can_run_host_binaries(), 88 - + install : get_option('install-mesa-clc'), 89 - + ) 90 - +endif
-12
pkgs/development/libraries/mesa/darwin.nix
··· 27 27 meta 28 28 ; 29 29 30 - # Darwin build fixes. FIXME: remove in 25.1. 31 - patches = [ 32 - (fetchpatch { 33 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/e89eba0796b3469f1d2cdbb600309f6231a8169d.patch"; 34 - hash = "sha256-0EP0JsYy+UTQ+eGd3sMfoLf1R+2e8n1flmQAHq3rCR4="; 35 - }) 36 - (fetchpatch { 37 - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/568a4ca899762fe96fc9b34d2288d07e6656af87.patch"; 38 - hash = "sha256-uLxa5vA3/cYAIJT9h7eBQ1EBu4MnMg9R5uGAHzTb5Fc="; 39 - }) 40 - ]; 41 - 42 30 outputs = [ 43 31 "out" 44 32 "dev"
+41 -28
pkgs/development/libraries/mesa/default.nix
··· 91 91 "intel-nullhw" 92 92 ] 93 93 , mesa 94 + , mesa-gl-headers 94 95 , makeSetupHook 95 96 }: 96 97 ··· 138 139 139 140 patches = [ 140 141 ./opencl.patch 141 - # cherry-picked from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32719 142 - # safe to remove for versions > 24.3.2 143 - ./cross_clc.patch 144 142 ]; 145 143 146 144 postPatch = '' ··· 154 152 substituteInPlace src/amd/vulkan/meson.build --replace \ 155 153 "get_option('datadir')" "'${placeholder "out"}/share'" 156 154 155 + for header in ${toString mesa-gl-headers.headers}; do 156 + if ! diff -q $header ${mesa-gl-headers}/$header; then 157 + echo "File $header does not match between mesa and mesa-gl-headers, please update mesa-gl-headers first!" 158 + exit 42 159 + fi 160 + done 161 + 157 162 ${copyRustDeps} 158 163 ''; 159 164 160 165 outputs = [ 161 - "out" "dev" "drivers" "driversdev" "opencl" "teflon" "osmesa" 166 + "out" "dev" 167 + "drivers" 168 + # OpenCL drivers pull in ~1G of extra LLVM stuff, so don't install them 169 + # if the user didn't explicitly ask for it 170 + "opencl" 162 171 # the Dozen drivers depend on libspirv2dxil, but link it statically, and 163 172 # libspirv2dxil itself is pretty chonky, so relocate it to its own output in 164 173 # case anything wants to use it at some point 165 174 "spirv2dxil" 175 + # tools for the host platform to be used when cross-compiling 176 + "cross_tools" 166 177 ]; 167 178 168 179 # Keep build-ids so drivers can use them for caching, etc. ··· 196 207 # Enable glvnd for dynamic libGL dispatch 197 208 (lib.mesonEnable "glvnd" true) 198 209 199 - (lib.mesonBool "gallium-nine" true) # Direct3D in Wine 200 - (lib.mesonBool "osmesa" true) # used by wine 210 + (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK 211 + (lib.mesonBool "osmesa" false) # deprecated upstream 212 + (lib.mesonEnable "gallium-xa" false) # old and mostly dead 213 + 201 214 (lib.mesonBool "teflon" true) # TensorFlow frontend 202 215 203 216 # Enable all freedreno kernel mode drivers. (For example, virtio can be ··· 206 219 (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl") 207 220 208 221 # Enable Intel RT stuff when available 209 - (lib.mesonBool "install-intel-clc" true) 210 - (lib.mesonBool "install-mesa-clc" true) 211 222 (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) 223 + 224 + # Required for OpenCL 212 225 (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") 213 226 214 227 # Clover, old OpenCL frontend 215 228 (lib.mesonOption "gallium-opencl" "icd") 216 - (lib.mesonBool "opencl-spirv" true) 217 229 218 230 # Rusticl, new OpenCL frontend 219 231 (lib.mesonBool "gallium-rusticl" true) ··· 221 233 # meson auto_features enables this, but we do not want it 222 234 (lib.mesonEnable "android-libbacktrace" false) 223 235 (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) 236 + 237 + # Build and install extra tools for cross 238 + (lib.mesonBool "install-mesa-clc" true) 239 + (lib.mesonBool "install-precomp-compiler" true) 240 + 241 + # Disable valgrind on targets where it's not available 224 242 (lib.mesonEnable "valgrind" withValgrind) 225 243 ] ++ lib.optionals enablePatentEncumberedCodecs [ 226 244 (lib.mesonOption "video-codecs" "all") 227 245 ] ++ lib.optionals needNativeCLC [ 228 - (lib.mesonOption "intel-clc" "system") 229 246 (lib.mesonOption "mesa-clc" "system") 247 + (lib.mesonOption "precomp-compiler" "system") 230 248 ]; 231 249 232 250 strictDeps = true; ··· 295 313 wayland-scanner 296 314 ] ++ lib.optionals needNativeCLC [ 297 315 # `or null` to not break eval with `attribute missing` on darwin to linux cross 298 - (buildPackages.mesa.driversdev or null) 316 + (buildPackages.mesa.cross_tools or null) 299 317 ]; 300 318 301 319 disallowedRequisites = lib.optionals needNativeCLC [ 302 - (buildPackages.mesa.driversdev or null) 320 + (buildPackages.mesa.cross_tools or null) 303 321 ]; 304 322 305 323 propagatedBuildInputs = [ libdrm ]; ··· 308 326 309 327 postInstall = '' 310 328 # Move driver-related bits to $drivers 329 + moveToOutput "lib/gallium-pipe" $drivers 311 330 moveToOutput "lib/gbm" $drivers 312 331 moveToOutput "lib/lib*_mesa*" $drivers 313 332 moveToOutput "lib/libgallium*" $drivers 314 333 moveToOutput "lib/libglapi*" $drivers 315 334 moveToOutput "lib/libpowervr_rogue*" $drivers 316 335 moveToOutput "lib/libvulkan_*" $drivers 317 - moveToOutput "lib/libxatracker*" $drivers 336 + moveToOutput "lib/libteflon.so" $drivers 318 337 319 338 # Update search path used by glvnd (it's pointing to $out but drivers are in $drivers) 320 339 for js in $drivers/share/glvnd/egl_vendor.d/*.json; do ··· 337 356 echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd 338 357 echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd 339 358 340 - moveToOutput bin/intel_clc $driversdev 341 - moveToOutput bin/mesa_clc $driversdev 342 - moveToOutput lib/gallium-pipe $opencl 359 + moveToOutput bin/intel_clc $cross_tools 360 + moveToOutput bin/mesa_clc $cross_tools 361 + moveToOutput bin/vtn_bindgen $cross_tools 362 + 343 363 moveToOutput "lib/lib*OpenCL*" $opencl 344 - moveToOutput "lib/libOSMesa*" $osmesa 364 + 345 365 moveToOutput bin/spirv2dxil $spirv2dxil 346 366 moveToOutput "lib/libspirv_to_dxil*" $spirv2dxil 347 - moveToOutput lib/libteflon.so $teflon 348 367 ''; 349 368 350 369 postFixup = '' ··· 356 375 # remove pkgconfig files for GL/EGL; they are provided by libGL. 357 376 rm -f $dev/lib/pkgconfig/{gl,egl}.pc 358 377 359 - # Move development files for libraries in $drivers to $driversdev 360 - mkdir -p $driversdev/include 361 - mv $dev/include/xa_* $dev/include/d3d* -t $driversdev/include || true 362 - mkdir -p $driversdev/lib/pkgconfig 363 - for pc in lib/pkgconfig/{xatracker,d3d}.pc; do 364 - if [ -f "$dev/$pc" ]; then 365 - substituteInPlace "$dev/$pc" --replace $out $drivers 366 - mv $dev/$pc $driversdev/$pc 367 - fi 378 + # remove headers moved to mesa-gl-headers 379 + for header in ${toString mesa-gl-headers.headers}; do 380 + rm -f $dev/$header 368 381 done 369 382 370 383 # update symlinks pointing to libgallium in $out ··· 392 405 393 406 env.NIX_CFLAGS_COMPILE = toString ([ 394 407 "-UPIPE_SEARCH_DIR" 395 - "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" 408 + "-DPIPE_SEARCH_DIR=\"${placeholder "drivers"}/lib/gallium-pipe\"" 396 409 ]); 397 410 398 411 passthru = {
+39
pkgs/development/libraries/mesa/headers.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitLab, 5 + }: 6 + 7 + let 8 + common = import ./common.nix { inherit lib fetchFromGitLab; }; 9 + headers = [ 10 + "include/EGL/eglext_angle.h" 11 + "include/EGL/eglmesaext.h" 12 + ]; 13 + in 14 + stdenv.mkDerivation rec { 15 + pname = "mesa-gl-headers"; 16 + 17 + # These are a bigger rebuild and don't change often, so keep them separate. 18 + version = "25.0.1"; 19 + 20 + src = fetchFromGitLab { 21 + domain = "gitlab.freedesktop.org"; 22 + owner = "mesa"; 23 + repo = "mesa"; 24 + rev = "mesa-${version}"; 25 + hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; 26 + }; 27 + 28 + dontBuild = true; 29 + 30 + installPhase = '' 31 + for header in ${toString headers}; do 32 + install -Dm444 $header $out/$header 33 + done 34 + ''; 35 + 36 + passthru = { inherit headers; }; 37 + 38 + inherit (common) meta; 39 + }
-3
pkgs/development/python-modules/horizon-eda/default.nix
··· 1 1 { 2 2 buildPythonPackage, 3 3 horizon-eda, 4 - mesa, 5 4 pycairo, 6 5 python, 7 6 pythonOlder, ··· 24 23 disabled = pythonOlder "3.9"; 25 24 26 25 buildInputs = base.buildInputs ++ [ 27 - mesa 28 - mesa.osmesa 29 26 python 30 27 ]; 31 28
-1
pkgs/servers/x11/xorg/overrides.nix
··· 604 604 }); 605 605 606 606 xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { 607 - buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker 608 607 env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 609 608 meta = attrs.meta // { 610 609 platforms = ["i686-linux" "x86_64-linux"];
-2
pkgs/tools/X11/primus/lib.nix
··· 5 5 fetchpatch, 6 6 libX11, 7 7 libGL, 8 - mesa, 9 8 nvidia_x11 ? null, 10 9 libglvnd, 11 10 }: ··· 48 47 "LIBDIR=$(out)/lib" 49 48 "PRIMUS_libGLa=${aPackage}/lib/libGL.so" 50 49 "PRIMUS_libGLd=${libGL}/lib/libGL.so" 51 - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" 52 50 ]; 53 51 54 52 installPhase = ''
+1
pkgs/top-level/all-packages.nix
··· 9905 9905 mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra 9906 9906 9907 9907 libgbm = callPackage ../development/libraries/mesa/gbm.nix {}; 9908 + mesa-gl-headers = callPackage ../development/libraries/mesa/headers.nix {}; 9908 9909 9909 9910 ## End libGL/libGLU/Mesa stuff 9910 9911
+1 -1
pkgs/top-level/python-packages.nix
··· 6099 6099 hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; 6100 6100 6101 6101 horizon-eda = callPackage ../development/python-modules/horizon-eda { 6102 - inherit (pkgs) horizon-eda mesa; 6102 + inherit (pkgs) horizon-eda; 6103 6103 }; 6104 6104 6105 6105 howdoi = callPackage ../development/python-modules/howdoi { };