git.iko.soy/typeable/nixpkgs
on master help sign in
php.extensions.couchbase: 2.6.2 -> 3.1.2
commit565885bb4b82b7d953e3b2ab423df16882f1d7b1 authorElis Hirwing <elis@hirwing.se> dateTue 8 Jun 2021, 13:28 (5 years ago) parent5e1ad94
2 files changed+18−27
pkgs/development/php-packages/couchbase/default.nix+7−27 pkgs/development/php-packages/couchbase/libcouchbase.patch+11
pkgs/development/php-packages/couchbase/default.nix+7−27
@@ -1,7 +1,7 @@
1−{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
1+{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
22let
33 pname = "couchbase";
4− version = "2.6.2";
4+ version = "3.1.2";
55in
66buildPecl {
77 inherit pname version;
@@ -10,38 +10,19 @@ buildPecl {
1010 owner = "couchbase";
1111 repo = "php-couchbase";
1212 rev = "v${version}";
13− sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3";
13+ sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42";
1414 };
1515
1616 configureFlags = [ "--with-couchbase" ];
1717
1818 buildInputs = [ libcouchbase zlib ];
1919 internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
20− peclDeps = [ php.extensions.igbinary ];
2120
2221 patches = [
23− (writeText "php-couchbase.patch" ''
24− --- a/config.m4
25− +++ b/config.m4
26− @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
27− LIBCOUCHBASE_DIR=$PHP_COUCHBASE
28− else
29− AC_MSG_CHECKING(for libcouchbase in default path)
30− - for i in /usr/local /usr; do
31− + for i in ${libcouchbase}; do
32− if test -r $i/include/libcouchbase/couchbase.h; then
33− LIBCOUCHBASE_DIR=$i
34− AC_MSG_RESULT(found in $i)
35− @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \
36− igbinary_inc_path="$phpincludedir"
37− elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
38− igbinary_inc_path="$phpincludedir"
39− + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then
40− + igbinary_inc_path="${php.extensions.igbinary.dev}/include"
41− fi
42− if test "$igbinary_inc_path" = ""; then
43− AC_MSG_WARN([Cannot find igbinary.h])
44− '')
22+ (substituteAll {
23+ src = ./libcouchbase.patch;
24+ inherit libcouchbase;
25+ })
4526 ];
4627
4728 meta = with lib; {
@@ -49,6 +30,5 @@ buildPecl {
4930 license = licenses.asl20;
5031 homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
5132 maintainers = teams.php.members;
52− broken = versionAtLeast php.version "8.0";
5333 };
5434}
pkgs/development/php-packages/couchbase/libcouchbase.patchnew file+11
@@ -0,0 +1,11 @@
1+--- a/config.m4
2++++ b/config.m4
3+@@ -28,7 +28,7 @@ if test "$PHP_COUCHBASE" != "no"; then
4+
5+ dnl fallback on standard directory
6+ else
7+- for i in /usr/local /usr; do
8++ for i in @libcouchbase@; do
9+ if test -r $i/include/libcouchbase/couchbase.h; then
10+ LIBCOUCHBASE_DIR=$i
11+ AC_MSG_RESULT(found in $i)