Merge pull request #2898 from robberer/php/mssql

mssql support for php-5.4
This commit is contained in:
Austin Seipp 2014-06-18 16:25:24 -05:00
commit 537dbfed78
2 changed files with 14 additions and 1 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }: , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds }:
let let
libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@ -171,6 +171,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
configureFlags = ["--enable-fpm"]; configureFlags = ["--enable-fpm"];
}; };
mssql = {
configureFlags = ["--with-mssql=${freetds}"];
buildInputs = [freetds];
};
/* /*
php is build within this derivation in order to add the xdebug lines to the php.ini. php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything. So both Apache and command line php both use xdebug without having to configure anything.
@ -213,6 +218,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
zipSupport = config.php.zip or true; zipSupport = config.php.zip or true;
ftpSupport = config.php.ftp or true; ftpSupport = config.php.ftp or true;
fpmSupport = config.php.fpm or true; fpmSupport = config.php.fpm or true;
mssqlSupport = config.php.mssql or true;
}; };
configurePhase = '' configurePhase = ''

View File

@ -8,6 +8,13 @@ stdenv.mkDerivation {
sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
}; };
doDist = true;
distPhase = ''
touch $out/include/tds.h
touch $out/lib/libtds.a
'';
meta = { meta = {
description = description =
"Libraries to natively talk to Microsoft SQL Server and Sybase databases"; "Libraries to natively talk to Microsoft SQL Server and Sybase databases";