From 78746b036be592612e260937b43646c9e2ae6128 Mon Sep 17 00:00:00 2001 From: Wouter den Breejen Date: Tue, 30 Oct 2007 16:04:45 +0000 Subject: [PATCH] PHP can take mysql as a arugment svn path=/nixpkgs/trunk/; revision=9558 --- pkgs/development/interpreters/php/builder.sh | 4 ++++ pkgs/development/interpreters/php/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/builder.sh b/pkgs/development/interpreters/php/builder.sh index 3a53e110dfc..a5aadf2857f 100644 --- a/pkgs/development/interpreters/php/builder.sh +++ b/pkgs/development/interpreters/php/builder.sh @@ -14,6 +14,10 @@ fi if test -n "$postgresql"; then configureFlags="$configureFlags --with-pgsql=$postgresql" fi + +if test -n "$mysql"; then + configureFlags="$configureFlags --with-mysql=$mysql" +fi makeFlags="APXS_LIBEXECDIR=$out/modules $makeFlags" diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 745c171fa8a..dc704b768c9 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null, postgresql ? null}: +{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null, postgresql ? null, mysql ? null}: assert libxml2 != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [flex bison libxml2 apacheHttpd]; - inherit unixODBC postgresql; + inherit unixODBC postgresql mysql; odbcSupport = unixODBC != null;