diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-31 15:49:03 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-31 16:17:54 -0700 |
| commit | 5f231e7f08af1c813cede9ef4691c77dce82e140 (patch) | |
| tree | d0c157eb7cdfe9a9d0db980996871da7b0f004e5 | |
| parent | b8d75c66ee5236bcbb47493ebd4409464f92c0e6 (diff) | |
| download | nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar.gz nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar.bz2 nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar.lz nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar.xz nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.tar.zst nixpkgs-5f231e7f08af1c813cede9ef4691c77dce82e140.zip | |
mysql51: Refactor
| -rw-r--r-- | pkgs/servers/sql/mysql/5.1.x.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index 3389f811489..caf6149e62c 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}: +{ stdenv, fetchurl, ps, ncurses, zlib, perl, openssl }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -10,16 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; - buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps; + buildInputs = [ ncurses zlib perl openssl ] ++ stdenv.lib.optional stdenv.isLinux ps; - configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" + - (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); + configureFlags = [ + "--enable-thread-safe-client" + "--with-ssl=${openssl}" + "--with-embedded-server" + "--with-plugins=max-no-ndb" + "--with-unix-socket-path=/run/mysqld/mysqld.sock" + ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") " --with-lib-ccflags=-fPIC"; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [./abi_check.patch]; + patches = [ ./abi_check.patch ]; postInstall = '' |