public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/sql/mysql55/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, darwinInstallNameToolUtility, perl}:
{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl }:
# Note: zlib is not required; MySQL can use an internal zlib.
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
};
buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];
buildInputs = [ cmake bison ncurses openssl readline zlib ];
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";