Darwin: Add mig', lipo', etc. to `stdenvNative'.

Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
Ludovic Courtès
2012-04-23 15:47:31 +00:00
parent 0a9d954bc6
commit 04600bbec1
31 changed files with 57 additions and 139 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev, enableTextureFloats ? false
, python, libxml2Python, lipo ? null }:
, python, libxml2Python }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
libxml2Python libX11 libXext libxcb lipo libXt udev ];
libxml2Python libX11 libXext libxcb libXt udev ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison ];

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, cmake, ruby }:
stdenv.mkDerivation {
name = "yajl-2.0.1";
@@ -9,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
};
buildInputs = [ cmake ruby ]
++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
buildInputs = [ cmake ruby ];
meta = {
description = "Yet Another JSON Library";