public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: 20.3.5 -> 21.0.1 (#109319)

Browse Source
This commit is contained in:
Michael Weiss 2021-03-25 15:34:08 +01:00 committed by GitHub
parent f6e726a3db
commit 8cd7e290e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/mesa/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, lib, fetchurl, fetchpatch, buildPackages { stdenv, lib, fetchurl, fetchpatch, buildPackages
, pkg-config, intltool, ninja, meson , meson, pkg-config, ninja
, file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , intltool, bison, flex, file, python3Packages
, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, python3Packages , libelf, libvdpau
, libglvnd , libglvnd
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? ["auto"] , galliumDrivers ? ["auto"]
@ -31,7 +32,7 @@ with lib;
let let
# Release calendar: https://www.mesa3d.org/release-calendar.html # Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule # Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "20.3.5"; version = "21.0.1";
branch = versions.major version; branch = versions.major version;
in in
@ -46,7 +47,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "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" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
]; ];
sha256 = "1klifqyr54q8ar8sncykgqllil98q1ma4i6g9j2c18yzcggp56lh"; sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -113,7 +114,8 @@ stdenv.mkDerivation {
"-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dva-libs-path=${placeholder "drivers"}/lib/dri"
"-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
"-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine
"-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine "-Dosmesa=${boolToString enableOSMesa}" # used by wine
"-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
"-Dglvnd=true" "-Dglvnd=true"
]; ];
@ -130,7 +132,7 @@ stdenv.mkDerivation {
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config meson ninja meson pkg-config ninja
intltool bison flex file intltool bison flex file
python3Packages.python python3Packages.Mako python3Packages.python python3Packages.Mako
] ++ lib.optionals (elem "wayland" eglPlatforms) [ ] ++ lib.optionals (elem "wayland" eglPlatforms) [