Unverified Commit 7fbd085f authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

gnugrep, diffutils: fix cross on Darwin (#462729)

parents d0307a18 3794fda5

pkgs/tools/text/diffutils/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -44,8 +44,14 @@ stdenv.mkDerivation rec { 


  # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under

  # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail.

  # Disable all gnulib tests when building on Darwin due to test-nl_langinfo-mt failure

  # known by upstream https://www.mail-archive.com/bug-gnulib@gnu.org/msg50806.html

  postPatch =

    if

    if stdenv.buildPlatform.isDarwin then

      ''

        sed -i 's:gnulib-tests::g' Makefile.in

      ''

    else if

      ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))

    then

      ''

pkgs/tools/text/gnugrep/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -38,8 +38,9 @@ stdenv.mkDerivation { 
  # Some gnulib tests fail

  # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714

  # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330

  # - when building on Darwin (cross-compilation): test-nl_langinfo-mt fails

  postPatch =

    if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then

    if stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin then

      ''

        sed -i 's:gnulib-tests::g' Makefile.in

      ''