pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl
|
||||
, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
|
||||
, mesa, automake, autoconf
|
||||
, gstreamerSupport ? true, gst_all_1 }:
|
||||
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
|
||||
version = "1.22.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
|
||||
};
|
||||
|
||||
@@ -40,20 +40,20 @@ in stdenv.mkDerivation rec {
|
||||
"--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" ];
|
||||
] ++ lib.optional gstreamerSupport "--enable-cogl-gst"
|
||||
++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
|
||||
|
||||
propagatedBuildInputs = with xorg; [
|
||||
glib gdk-pixbuf gobject-introspection wayland mesa
|
||||
libGL libXrandr libXfixes libXcomposite libXdamage
|
||||
]
|
||||
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
|
||||
++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base ];
|
||||
|
||||
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
|
||||
buildInputs = lib.optionals pangoSupport [ pango cairo ];
|
||||
|
||||
COGL_PANGO_DEP_CFLAGS
|
||||
= stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
|
||||
= lib.optionalString (stdenv.isDarwin && pangoSupport)
|
||||
"-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
|
||||
|
||||
#doCheck = true; # all tests fail (no idea why)
|
||||
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A small open source library for using 3D graphics hardware for rendering";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user