diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
| commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
| tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/cogl | |
| parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
| parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
| download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip | |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cogl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cogl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cogl/default.nix b/nixpkgs/pkgs/development/libraries/cogl/default.nix index cff32ca2d70f..8eacbb4f855f 100644 --- a/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 -, mesa_noglu +, mesa , gstreamerSupport ? true, gst_all_1 }: let @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobject-introspection wayland mesa_noglu + glib gdk_pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage ] ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer |