diff options
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix (renamed from pkgs/development/interpreters/php_configurable/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/fix.patch (renamed from pkgs/development/interpreters/php_configurable/fix.patch) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php/default.nix index 422d6ceba87..422d6ceba87 100644 --- a/pkgs/development/interpreters/php_configurable/default.nix +++ b/pkgs/development/interpreters/php/default.nix diff --git a/pkgs/development/interpreters/php_configurable/fix.patch b/pkgs/development/interpreters/php/fix.patch index 1cec8fea0fe..1cec8fea0fe 100644 --- a/pkgs/development/interpreters/php_configurable/fix.patch +++ b/pkgs/development/interpreters/php/fix.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f166dd2c8..c6f75018dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2843,10 +2843,10 @@ let perl = useFromStdenv "perl" (if system != "i686-cygwin" then perl510 else sysPerl); - php = makeOverridable (import ../development/interpreters/php_configurable) { + php = makeOverridable (import ../development/interpreters/php) { inherit stdenv fetchurl lib composableDerivation autoconf automake - flex bison apacheHttpd mysql libxml2 # gettext + flex bison apacheHttpd mysql libxml2 zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng; }; |