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

cogl: Apply patches to work with mesa 19.2.3

Browse Source
This commit is contained in:
adisbladis 2019-11-07 16:41:26 +00:00
parent 803f9cce9d
commit ec8fc7b97f
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/cogl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
, mesa , mesa, automake, autoconf
, gstreamerSupport ? true, gst_all_1 }: , gstreamerSupport ? true, gst_all_1 }:
let let
@ -29,11 +29,17 @@ in stdenv.mkDerivation rec {
url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056; url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; 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" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig libintl ]; nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
configureFlags = [ configureFlags = [
"--enable-introspection" "--enable-introspection"
@ -41,7 +47,7 @@ in stdenv.mkDerivation rec {
"--enable-wayland-egl-platform" "--enable-wayland-egl-platform"
"--enable-wayland-egl-server" "--enable-wayland-egl-server"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" ] ++ 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; [ propagatedBuildInputs = with xorg; [
glib gdk-pixbuf gobject-introspection wayland mesa glib gdk-pixbuf gobject-introspection wayland mesa