public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php.extensions: Apply patches from the php source root by default

Browse Source
This commit is contained in:
talyz 2020-06-02 15:34:58 +02:00
parent 4cd605f3ca
commit 5db5b25c63
No known key found for this signature in database
GPG Key ID: 2DED2151F4671A2B
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/php-packages.nix
View File

@ -854,6 +854,9 @@ in
inherit configureFlags internalDeps buildInputs inherit configureFlags internalDeps buildInputs
zendExtension doCheck; zendExtension doCheck;
prePatch = "pushd ../..";
postPatch = "popd";
preConfigure = '' preConfigure = ''
nullglobRestore=$(shopt -p nullglob) nullglobRestore=$(shopt -p nullglob)
shopt -u nullglob # To make ?-globbing work shopt -u nullglob # To make ?-globbing work
@ -989,8 +992,8 @@ in
# included by all .c-files. # included by all .c-files.
patches = [ patches = [
(pkgs.writeText "mysqlnd_config.patch" '' (pkgs.writeText "mysqlnd_config.patch" ''
--- a/mysqlnd.h --- a/ext/mysqlnd/mysqlnd.h
+++ b/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h
@@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H
+#include "config.h" +#include "config.h"
@ -1013,8 +1016,8 @@ in
# included after the ifdef... # included after the ifdef...
patches = lib.optional (lib.versionOlder php.version "7.4") [ patches = lib.optional (lib.versionOlder php.version "7.4") [
(pkgs.writeText "zend_file_cache_config.patch" '' (pkgs.writeText "zend_file_cache_config.patch" ''
--- a/zend_file_cache.c --- a/ext/opcache/zend_file_cache.c
+++ b/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c
@@ -27,9 +27,9 @@ @@ -27,9 +27,9 @@
#include "ext/standard/md5.h" #include "ext/standard/md5.h"
#endif #endif