Skip to content

Commit 9a144b9

Browse files
github-actions[bot]jtojnar
authored andcommitted
flake.lock: Update
gd: Add build dependencies Older versions of PHP pointlessly check for image libraries even when not using bundled libgd. Previously the `gd` package propagated those but this was removed in NixOS/nixpkgs@e986a2e Co-authored-by: Jan Tojnar <[email protected]>
1 parent 5819e46 commit 9a144b9

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/package-overrides.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,5 +356,18 @@ in
356356
)
357357
(attrs.patches or []);
358358
});
359+
360+
gd =
361+
if lib.versionOlder prev.php.version "7.4" then
362+
prev.extensions.gd.overrideAttrs (attrs: {
363+
buildInputs = attrs.buildInputs ++ [
364+
# Older versions of PHP check for these libraries even when not using bundled gd.
365+
pkgs.zlib
366+
pkgs.libjpeg
367+
pkgs.libpng
368+
];
369+
})
370+
else
371+
prev.extensions.gd;
359372
};
360373
}

0 commit comments

Comments
 (0)