nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: use --replace-fail

Browse Source
This commit is contained in:
Pol Dellaiera 2024-03-14 08:55:17 +01:00
parent 02b8c7ddb7
commit 81c42da3c3
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
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 # Don't record the configure flags since this causes unnecessary
# runtime dependencies # runtime dependencies
'' ''
for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace main/build-defs.h.in \
substituteInPlace $i \ --replace-fail '@CONFIGURE_COMMAND@' '(omitted)'
--replace '@CONFIGURE_COMMAND@' '(omitted)' \ substituteInPlace scripts/php-config.in \
--replace '@CONFIGURE_OPTIONS@' "" \ --replace-fail '@CONFIGURE_OPTIONS@' "" \
--replace '@PHP_LDFLAGS@' "" --replace-fail '@PHP_LDFLAGS@' ""
done
export EXTENSION_DIR=$out/lib/php/extensions export EXTENSION_DIR=$out/lib/php/extensions
@ -287,7 +286,7 @@ let
./scripts/dev/genfiles ./scripts/dev/genfiles
fi fi
'' + lib.optionalString stdenv.isDarwin '' '' + 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 # 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"; name = "gettext";
buildInputs = [ 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}" ]; configureFlags = [ "--with-gettext=${gettext}" ];
} }
{ {