diff options
| author | talyz <kim.lindberger@gmail.com> | 2020-05-02 23:25:41 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2020-05-09 23:38:45 +0200 |
| commit | fa4c995d0e8031be38c226284e45fb7d5a97e9a1 (patch) | |
| tree | 7737fca9eb8df675ec8bfeb984dbaced6a81d61d /pkgs/top-level/php-packages.nix | |
| parent | 2f1f359692a4af926f5e39653e7ea06f29a4c485 (diff) | |
| download | nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar.gz nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar.bz2 nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar.lz nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar.xz nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.tar.zst nixpkgs-fa4c995d0e8031be38c226284e45fb7d5a97e9a1.zip | |
php.extensions.couchbase: Fix build and runtime loading
The couchbase extension depends on the igbinary PECL which needs to be loaded and loaded prior to it. It also seems like the pcs extension isn't actually needed - it at least builds and loads without it. Since the pcs extension dependency was the reason couchbase didn't build on PHP 7.4 it now does, so let's unmark it broken.
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1f49a145c69..ff9e96f8b97 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -346,13 +346,6 @@ in version = "2.6.1"; pname = "couchbase"; - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - php.extensions.igbinary - php.extensions.pcs - ]; - src = pkgs.fetchFromGitHub { owner = "couchbase"; repo = "php-couchbase"; @@ -361,7 +354,14 @@ in }; configureFlags = [ "--with-couchbase" ]; + + buildInputs = [ + pkgs.libcouchbase + pkgs.zlib + ]; internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + patches = [ (pkgs.writeText "php-couchbase.patch" '' --- a/config.m4 @@ -388,7 +388,6 @@ in ]; meta.maintainers = lib.teams.php.members; - meta.broken = isPhp74; # Build error }; event = buildPecl { |