Unverified Commit 207d5b49 authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

php/build-support: fix usage of diff condition 

Remove double brackets and replace `diff` with `cmp`
parent 22e61b14

pkgs/build-support/php/hooks/composer-install-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ composerInstallConfigureHook() { 
    fi



    echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock"

    if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then

    if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then

        echo

        echo "ERROR: vendorHash is out of date"

        echo

pkgs/build-support/php/hooks/default.nix

+2 −1
Original line number Diff line number Diff line 
{ lib

, makeSetupHook

, diffutils

, jq

, moreutils

, makeBinaryWrapper
@@ -23,7 +24,7 @@ 
      substitutions = {

        # Specify the stdenv's `diff` by abspath to ensure that the user's build

        # inputs do not cause us to find the wrong `diff`.

        diff = "${lib.getBin buildPackages.diffutils}/bin/diff";

        cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";

      };

    } ./composer-install-hook.sh;

}