pyrox.dev
Merge #69537: mesa: 19.1.5 -> 19.2.1 (into staging)
+7
pkgs/development/libraries/SDL2/default.nix
+7
pkgs/development/libraries/SDL2/default.nix
···
36
37
patches = [ ./find-headers.patch ];
38
39
+
# Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797
40
+
postPatch = ''
41
+
substituteInPlace include/SDL_opengl_glext.h \
42
+
--replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \
43
+
--replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;"
44
+
'';
45
+
46
nativeBuildInputs = [ pkgconfig ];
47
48
propagatedBuildInputs = dlopenPropagatedBuildInputs;
+3
-3
pkgs/development/libraries/mesa/default.nix
+3
-3
pkgs/development/libraries/mesa/default.nix
···
27
with stdenv.lib;
28
29
let
30
-
version = "19.1.5";
31
branch = versions.major version;
32
in
33
···
35
pname = "mesa";
36
inherit version;
37
38
-
src = fetchurl {
39
urls = [
40
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
41
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
42
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
43
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
44
];
45
-
sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v";
46
};
47
48
prePatch = "patchShebangs .";
···
27
with stdenv.lib;
28
29
let
30
+
version = "19.2.1";
31
branch = versions.major version;
32
in
33
···
35
pname = "mesa";
36
inherit version;
37
38
+
src = fetchurl {
39
urls = [
40
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
41
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
42
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
43
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
44
];
45
+
sha256 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9";
46
};
47
48
prePatch = "patchShebangs .";