diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-06-18 16:25:24 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-06-18 16:25:24 -0500 |
commit | 537dbfed7870d6127223d6cebd2c9bcd4a150e21 (patch) | |
tree | 626b79283ef9aa6916e7cace19e0c9f42e46925d | |
parent | b9fc9bd760fb4ebf7e350c6432ec50dcbfb3bc4d (diff) | |
parent | 7b1b46b96bc282e96ad868de677058c3927bcd72 (diff) | |
download | nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar.gz nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar.bz2 nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar.lz nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar.xz nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.tar.zst nixlib-537dbfed7870d6127223d6cebd2c9bcd4a150e21.zip |
Merge pull request #2898 from robberer/php/mssql
mssql support for php-5.4
-rw-r--r-- | pkgs/development/interpreters/php/5.4.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/freetds/default.nix | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 5aabb61586e6..99f18c175c3f 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , 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 libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -171,6 +171,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) 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. 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; ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; + mssqlSupport = config.php.mssql or true; }; configurePhase = '' diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0d8fa1bd281c..547e9e813be1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation { sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; + doDist = true; + + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + meta = { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; |