diff options
| author | Alexander Ried <ried@mytum.de> | 2016-09-18 21:29:15 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-10-15 20:32:10 +0200 |
| commit | 9513304f61750481684445c635bf857bf9aa121b (patch) | |
| tree | c17ec4780b6f8f515b17554b2a9c458860180d17 | |
| parent | 1a1605cc32816522d5e28b1069972dfc1049630b (diff) | |
| download | nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar.gz nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar.bz2 nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar.lz nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar.xz nixpkgs-9513304f61750481684445c635bf857bf9aa121b.tar.zst nixpkgs-9513304f61750481684445c635bf857bf9aa121b.zip | |
cogl: 1.22.0 -> 1.22.2, enable wayland support
| -rw-r--r-- | pkgs/development/libraries/cogl/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 88bb6707749..1ac34f7608b 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , gstreamerSupport ? true, gst_all_1 }: let ver_maj = "1.22"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cogl-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; + sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" "--enable-kms-egl-platform" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection + glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty |