nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: remove wayland support, can't find wayland-egl.pc

Browse Source 
Don't know how it could build before.
This commit is contained in:
Luca Bruno 2014-11-10 01:07:37 +01:00
parent 2e380c0070
commit 4d8afa2c4b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/cogl/1.18.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , pangoSupport ? true, pango, cairo, gobjectIntrospection
, gstreamerSupport ? true, gst_all_1 }: , gstreamerSupport ? true, gst_all_1 }:
let let
@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
"--enable-gles1" "--enable-gles1"
"--enable-gles2" "--enable-gles2"
"--enable-kms-egl-platform" "--enable-kms-egl-platform"
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
propagatedBuildInputs = with xorg; [ propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection glib gdk_pixbuf gobjectIntrospection
mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland mesa_noglu libXrandr libXfixes libXcomposite libXdamage
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , pangoSupport ? true, pango, cairo, gobjectIntrospection
, gstreamerSupport ? true, gst_all_1 }: , gstreamerSupport ? true, gst_all_1 }:
let let
@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
"--enable-gles1" "--enable-gles1"
"--enable-gles2" "--enable-gles2"
"--enable-kms-egl-platform" "--enable-kms-egl-platform"
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
propagatedBuildInputs = with xorg; [ propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection glib gdk_pixbuf gobjectIntrospection
mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland mesa_noglu libXrandr libXfixes libXcomposite libXdamage
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer