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

Merge #69537: mesa: 19.1.5 -> 19.2.1 (into staging)

Browse Source
This commit is contained in:
Vladimír Čunát 2019-10-09 20:44:55 +02:00
commit 11dae1a516
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/SDL2/default.nix
View File

@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
patches = [ ./find-headers.patch ]; patches = [ ./find-headers.patch ];
# Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797
postPatch = ''
substituteInPlace include/SDL_opengl_glext.h \
--replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \
--replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;"
'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = dlopenPropagatedBuildInputs; propagatedBuildInputs = dlopenPropagatedBuildInputs;

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

@ -27,7 +27,7 @@
with stdenv.lib; with stdenv.lib;
let let
version = "19.1.5"; version = "19.2.1";
branch = versions.major version; branch = versions.major version;
in in
@ -35,14 +35,14 @@ stdenv.mkDerivation {
pname = "mesa"; pname = "mesa";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
"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"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
]; ];
sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v"; sha256 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";