about summary refs log tree commit diff
path: root/pkgs/development/interpreters/php
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2020-03-28 23:03:35 +0100
committertalyz <kim.lindberger@gmail.com>2020-04-05 16:44:01 +0200
commit90dcab948c22f997a76f9f77afe5f542af2e6734 (patch)
treef38d3824399f0165bbfa93a63705c9d05d7db836 /pkgs/development/interpreters/php
parentb1106a18510245bfd642c057dda43ad5ea985baa (diff)
downloadnixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar.gz
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar.bz2
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar.lz
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar.xz
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.tar.zst
nixlib-90dcab948c22f997a76f9f77afe5f542af2e6734.zip
php.packages: Use derivations for internalDeps in mkExtension
Make mkExtension put headers in the dev output and use them, instead of
a different part of the current source tree, when referring to another
extension by using internalDeps.

This means external extensions can be built against the internal ones.
Diffstat (limited to 'pkgs/development/interpreters/php')
-rw-r--r--pkgs/development/interpreters/php/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 3c2a73a5c193..082f2ef8fdcd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -171,7 +171,8 @@ let
                 in
                   lib.nameValuePair extName {
                     text = "${type}=${ext}/lib/php/extensions/${extName}.so";
-                    deps = lib.optionals (ext ? internalDeps) ext.internalDeps;
+                    deps = lib.optionals (ext ? internalDeps)
+                      (map getExtName ext.internalDeps);
                   })
                 extList);