Skip to content

Commit

Permalink
flake.lock: Update
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
2 people authored and drupol committed Mar 25, 2022
1 parent 5819e46 commit 9a144b9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions pkgs/package-overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -356,5 +356,18 @@ in
)
(attrs.patches or []);
});

gd =
if lib.versionOlder prev.php.version "7.4" then
prev.extensions.gd.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [
# Older versions of PHP check for these libraries even when not using bundled gd.
pkgs.zlib
pkgs.libjpeg
pkgs.libpng
];
})
else
prev.extensions.gd;
};
}

0 comments on commit 9a144b9

Please sign in to comment.