diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-04-23 15:47:31 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-04-23 15:47:31 +0000 |
| commit | 04600bbec1d0902b6aeec4528718f6fc7c3dc040 (patch) | |
| tree | 5ae660e72691c5e49d1784e725d65513aab39237 /pkgs/servers | |
| parent | 0a9d954bc6aa8012a1ac8d0f9dafb26a2a3ce1fb (diff) | |
| download | nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.gz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.bz2 nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.lz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.xz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.zst nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.zip | |
Darwin: Add `mig', `lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. svn path=/nixpkgs/trunk/; revision=33893
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/mysql55/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index f105b4daaf6a..3f26ea1f98bf 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -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"; |