| 25 Mar 2022 |
 Jan Tojnar | package-overrides.nix corresponds to php-packages.nix in fossar/nix-phps | 13:23:53 |
| Jan Tojnar | * php-packages.nix in Nixpkgs corresponds to package-overrides.nix in fossar/nix-phps | 13:24:23 |
 Pol | So I add a new entry in there with gd | 13:24:41 |
| Pol | * So I add a new entry in there with gd, and add the missing deps. | 13:24:47 |
| Jan Tojnar | yeah | 13:24:51 |
| Jan Tojnar | but we should also check if removing the propagation from libgd was a right thing | 13:25:49 |
| Jan Tojnar | (if not, it should be reverted) | 13:26:07 |
| Pol | In reply to @jtojnar:matrix.org
but we should also check if removing the propagation from libgd was a right thing How do you do that ? | 13:26:38 |
| Jan Tojnar | sorry, forgot to post the most likely responsible commit: https://github.com/NixOS/nixpkgs/commit/e986a2e0c2162941e12c9a32485a67f651a6c0d2 | 13:26:59 |
| Pol | Wow | 13:28:59 |
| Jan Tojnar | Looking at ${gd.dev}/lib/pkgconfig/*.pc, those libraries are indeed listed in Requires.private field, not Requires. Nor does libpng seem to be mentioned in the headers. So it looks like a right call has been made. | 13:29:37 |
| Jan Tojnar | 🤦♀️, I actually proposed the change https://github.com/NixOS/nixpkgs/pull/158698#discussion_r802008169 | 13:31:21 |
| Jan Tojnar | 🤦♀️ I completely forgot about that | 13:31:43 |
| Jan Tojnar | I wonder how does that even work for the newer version, it’s not like libpng is available there: https://github.com/NixOS/nixpkgs/blob/d6e2e39a6e5998e4ad4cbd9d422835b365dfa763/pkgs/top-level/php-packages.nix#L295 | 13:41:09 |
| Jan Tojnar | I would expect the pkg-config check here to fail: https://github.com/php/php-src/blob/20fe5e41629c31c8445d1df09d17b471be166774/ext/gd/config.m4#L77 | 13:45:09 |
| Jan Tojnar | oh, apparently, it is only used for the bundled-libgd case: https://github.com/php/php-src/blob/20fe5e41629c31c8445d1df09d17b471be166774/ext/gd/config.m4#L182 | 13:46:38 |
| Pol | So, what's the battle plan in the end? | 14:16:59 |
| Pol | I think I got something working locally. Going to amend the PR | 14:18:09 |
| Jan Tojnar | I would go with extra dependencies in package-overrides.nix | 14:19:03 |
| Pol | yep that's what I did. | 14:19:14 |
| Jan Tojnar | and maybe link to the gd change in commit message | 14:19:33 |
| Pol | Done. | 14:22:59 |
| Pol | #drumrolls | 14:23:06 |
| Pol | Looks like we have a winner! | 14:27:19 |
| Pol | Looks ok for you Jan Tojnar ? | 14:30:58 |
| Pol | Committed your change. | 14:33:48 |
| Pol | Ready to be merged :) | 14:35:07 |
| Pol | Done. | 14:38:58 |
| Jan Tojnar | sorry, I meant squashing it even with the update commit, since that is still broken | 14:44:58 |
| Jan Tojnar | * sorry, I meant squashing it even with the update commit, since that one is still broken | 14:45:03 |
