Unverified Commit 042b6bbe authored by Sizhe Zhao's avatar Sizhe Zhao Committed by GitHub
Browse files

cpptrace: fix Darwin tests (#494663)

parents 3c851c1c 3ddc0919

pkgs/by-name/cp/cpptrace/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ stdenv.mkDerivation (finalAttrs: { 


  checkInputs = [ gtest ];



  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''

    dsymutil unittest

  '';



  doCheck = true;



  passthru = {

pkgs/by-name/od/odamex/package.nix

+1 −10
Original line number Diff line number Diff line
@@ -41,15 +41,6 @@ 
  withWayland ? stdenv.hostPlatform.isLinux,

}:



let

  # TODO: remove when this is resolved, likely at the next cpptrace bump

  cpptrace' = cpptrace.overrideAttrs {

    # tests are failing on darwin

    # https://hydra.nixos.org/build/310535948

    doCheck = !stdenv.hostPlatform.isDarwin;

  };

in



stdenv.mkDerivation (finalAttrs: {

  pname = "odamex";

  version = "12.1.0";
@@ -77,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { 
    SDL2

    SDL2_mixer

    SDL2_net

    cpptrace'

    cpptrace

    curl

    expat

    fltk