Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 29f3a2fd1a91
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20e62aa580c2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 13, 2020

  1. php < 7.4: Fix validation of PKG_CONFIG var 

    They were assuming it is an absolute path, but it (conventionally) can
be something to look up on the PATH too.

Fixes #90202
    @Ericson2314
    Ericson2314 committed Jun 13, 2020
    Copy the full SHA
    c1b9f86 View commit details

Commits on Jun 14, 2020

  1. Merge pull request #90249 from Ericson2314/fix-old-php 

    php < 7.4: Fix validation of PKG_CONFIG var
    @timokau
    timokau authored Jun 14, 2020
    Copy the full SHA
    20e62aa View commit details
Showing with 12 additions and 4 deletions.
  1. +12 −4 pkgs/development/interpreters/php/default.nix
16 changes: 12 additions & 4 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -195,9 +195,10 @@ let

hardeningDisable = [ "bindnow" ];

preConfigure = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies
preConfigure =
# 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)' \
@@ -206,7 +207,14 @@ let
done
export EXTENSION_DIR=$out/lib/php/extensions
''
# PKG_CONFIG need not be a relative path
+ lib.optionalString (! lib.versionAtLeast version "7.4") ''
for i in $(find . -type f -name "*.m4"); do
substituteInPlace $i \
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
done
'' + ''
./buildconf --copy --force
if test -f $src/genfiles; then