pkgs/development/libraries/mesa: pass lipo utility to this build on Darwin

svn path=/nixpkgs/trunk/; revision=21427
This commit is contained in:
Peter Simons 2010-04-29 14:56:52 +00:00
parent 85b7c134cb
commit 56ce7f2ae6
2 changed files with 3 additions and 1 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }: { stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa" throw "unsupported platform for Mesa"
@ -17,6 +17,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto [ pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo
]; ];
passthru = { inherit libdrm; }; passthru = { inherit libdrm; };

View file

@ -4712,6 +4712,7 @@ let
mesa = import ../development/libraries/mesa { mesa = import ../development/libraries/mesa {
inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm; inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm;
lipo = if stdenv.isDarwin then darwinLipoUtility else null;
}; };
ming = import ../development/libraries/ming { ming = import ../development/libraries/ming {