aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 9fda8091ce47..891e11dbadf9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
, galliumDrivers ? ["auto"]
, driDrivers ? ["auto"]
, vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
, enableGalliumNine ? stdenv.isLinux
@@ -31,7 +31,7 @@ with stdenv.lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
- version = "20.1.9";
+ version = "20.2.3";
branch = versions.major version;
in
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
- sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj";
+ sha256 = "0axqrqg1fas91fx30qjwhcp4yasdvk919hjds4lga7ak247286xf";
};
prePatch = "patchShebangs .";
@@ -58,7 +58,6 @@ stdenv.mkDerivation {
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
./opencl-install-dir.patch
./disk_cache-include-dri-driver-path-in-cache-key.patch
- ./link-radv-with-ld_args_build_id.patch
]
++ lib.optionals stdenv.hostPlatform.isMusl [
# Fix `-Werror=int-conversion` pthread warnings on musl.
@@ -129,7 +128,7 @@ stdenv.mkDerivation {
"-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
"-Dva-libs-path=${placeholder "drivers"}/lib/dri"
"-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
- "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine
+ "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine
"-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine
] ++ optionals stdenv.isLinux [
"-Dglvnd=true"
@@ -229,7 +228,7 @@ stdenv.mkDerivation {
inherit (libglvnd) driverLink;
};
- meta = with stdenv.lib; {
+ meta = {
description = "An open source 3D graphics library";
longDescription = ''
The Mesa project began as an open-source implementation of the OpenGL