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

svn merge ^/nixpkgs/trunk

Browse Source 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
This commit is contained in:
Yury G. Kudryashov
2012-01-26 15:27:03 +00:00
parent f878980c8b d9de74edd6
commit 5b132f6e96
114 changed files with 2051 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/mysql55/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib}:
{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, darwinInstallNameToolUtility, perl}:
# Note: zlib is not required; MySQL can use an internal zlib.
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "03jl60mzrsd1jb8fvkz6c8j2239b37k8n1i07jk1q4yk58aq8ynh";
};
buildInputs = [ cmake bison ncurses openssl readline zlib ];
buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ];
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin";