pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, libX11, cairo
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true,
|
||||
}:
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.12.1";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, setfile
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "2.9.4";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchFromGitHub, fetchurl, pkg-config
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config
|
||||
, libXinerama, libSM, libXxf86vm
|
||||
, gtk2, gtk3
|
||||
, xorgproto, gst_all_1, setfile
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? libGLSupported
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
@@ -11,7 +11,7 @@
|
||||
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
assert withWebKit -> webkitgtk != null;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
|
||||
{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
|
||||
# darwin only attributes
|
||||
, derez, rez, setfile
|
||||
, AGL, Cocoa, Kernel, WebKit
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.wxWindows;
|
||||
maintainers = [ maintainers.lnl7 ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
@@ -12,7 +12,7 @@
|
||||
, xorgproto
|
||||
, gst_all_1
|
||||
, setfile
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? libGLSupported
|
||||
, libGLU ? null
|
||||
, libGL ? null
|
||||
@@ -29,7 +29,7 @@
|
||||
, QTKit ? null
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
assert withWebKit -> webkitgtk != null;
|
||||
|
||||
Reference in New Issue
Block a user