Unverified Commit df55edee authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #237100 from amjoseph-nixpkgs/pr/dtc/fixcross 

dtc: fix cross
parents cf264c3b 4cccbcd7

pkgs/development/compilers/dtc/default.nix

+9 −3
Original line number Diff line number Diff line
@@ -86,9 +86,15 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.mesonBool "tests" finalAttrs.doCheck)

  ];



  doCheck =

    # Checks are broken on aarch64 darwin

    # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436

  doCheck = !stdenv.isDarwin;

    !stdenv.isDarwin &&



    # we must explicitly disable this here so that mesonFlags receives

    # `-Dtests=disabled`; without it meson will attempt to run

    # hostPlatform binaries during the configurePhase.

    (with stdenv; buildPlatform.canExecute hostPlatform);



  meta = with lib; {

    description = "Device Tree Compiler";