ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #295836 from drupol/use-replace-fail

Browse Source 
php: use `--replace-fail`
This commit is contained in:
Pol Dellaiera 2024-03-14 21:32:59 +01:00 committed by GitHub
commit 22f0f4468a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/php/generic.nix
View File

@ -272,12 +272,11 @@ let
# Don't record the configure flags since this causes unnecessary
# runtime dependencies
''
for i in main/build-defs.h.in scripts/php-config.in; do
substituteInPlace $i \
--replace '@CONFIGURE_COMMAND@' '(omitted)' \
--replace '@CONFIGURE_OPTIONS@' "" \
--replace '@PHP_LDFLAGS@' ""
done
substituteInPlace main/build-defs.h.in \
--replace-fail '@CONFIGURE_COMMAND@' '(omitted)'
substituteInPlace scripts/php-config.in \
--replace-fail '@CONFIGURE_OPTIONS@' "" \
--replace-fail '@PHP_LDFLAGS@' ""
export EXTENSION_DIR=$out/lib/php/extensions
@ -287,7 +286,7 @@ let
./scripts/dev/genfiles
fi
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "-lstdc++" "-lc++"
substituteInPlace configure --replace-fail "-lstdc++" "-lc++"
'';
# When compiling PHP sources from Github, this file is missing and we

2
pkgs/top-level/php-packages.nix
View File

@ -411,7 +411,7 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "gettext";
buildInputs = [ gettext ];
postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' '';
postPhpize = ''substituteInPlace configure --replace-fail 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' '';
configureFlags = [ "--with-gettext=${gettext}" ];
}
{