cogl: Apply patches to work with mesa 19.2.3
This commit is contained in:
parent
803f9cce9d
commit
ec8fc7b97f
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
|
||||
, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
|
||||
, mesa
|
||||
, mesa, automake, autoconf
|
||||
, gstreamerSupport ? true, gst_all_1 }:
|
||||
|
||||
let
|
||||
@ -29,11 +29,17 @@ in stdenv.mkDerivation rec {
|
||||
url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
|
||||
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
|
||||
})
|
||||
|
||||
# Fix build with libglvnd headers (these headers used to be provided by mesa)
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
|
||||
sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libintl ];
|
||||
nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-introspection"
|
||||
@ -41,7 +47,7 @@ in stdenv.mkDerivation rec {
|
||||
"--enable-wayland-egl-platform"
|
||||
"--enable-wayland-egl-server"
|
||||
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
|
||||
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
|
||||
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
|
||||
|
||||
propagatedBuildInputs = with xorg; [
|
||||
glib gdk-pixbuf gobject-introspection wayland mesa
|
||||
|
Loading…
Reference in New Issue
Block a user