From 56ce7f2ae61966f64f27d284473ae03495137663 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:56:52 +0000 Subject: [PATCH] pkgs/development/libraries/mesa: pass lipo utility to this build on Darwin svn path=/nixpkgs/trunk/; revision=21427 --- pkgs/development/libraries/mesa/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cbe52ae0e37..9b3648c6ab8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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 throw "unsupported platform for Mesa" @@ -17,6 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig expat x11 libdrm xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto + lipo ]; passthru = { inherit libdrm; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d2d4189c84..12ad7236ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4712,6 +4712,7 @@ let mesa = import ../development/libraries/mesa { inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm; + lipo = if stdenv.isDarwin then darwinLipoUtility else null; }; ming = import ../development/libraries/ming {