Skip to content

php73: fix builds on darwin architecture #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2023
Merged

php73: fix builds on darwin architecture #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkgs/php/7.3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ let
url = "https://github.com/NixOS/nixpkgs/raw/42e9a2ccfab2a96d28c3c164a6cf41fb6f769de5/pkgs/development/interpreters/php/php73-darwin-isfinite.patch";
sha256 = "V0mLLmXa2qJyxIVW/7nEml6cXZTBbr42kkJiij9KPyk=";
})
];
# Handle macos versions that don't start with 10.* in libtool.
# https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d
(prev.pkgs.fetchpatch2 {
url = "https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d.patch";
sha256 = "sha256-x0vEcoXNFeQi3re1TrK/Np9AH5dy3wf95xM08xCyGE0=";
includes = [
"build/libtool.m4"
];
})
];
};
in
base.withExtensions (
Expand Down
3 changes: 3 additions & 0 deletions pkgs/phps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ let

"--enable-libxml"
"--with-libxml-dir=${prev.libxml2.dev}"
]
++ prev.lib.optionals (prev.lib.versionAtLeast args.version "7.3") [
"--with-pcre-regex=${prev.pcre2.dev}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, not sure about this. Should not it be versionOlder args.version "7.4"? I would expect newer PHP versions to pick it up using pkg-config.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure either, maybe @shyim or @HelloWorld017 knows?

Copy link
Contributor

@HelloWorld017 HelloWorld017 Jan 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

He is right. It should be applied to php<=7.3 (7.3, 7.2, ...)

You can just add it below to the xml line

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dammit...

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open a new PR right now. Sorry about that.

];

buildInputs =
Expand Down