Merge pull request #62752 from matthewbauer/darwin-fixes100
Fixes for x86_64-darwin failures on Hydra
This commit is contained in:
@@ -78,6 +78,6 @@ self = stdenv.mkDerivation rec {
|
||||
artistic1 bsd0 bsd2 bsd3 bsdOriginal
|
||||
gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
|
||||
];
|
||||
broken = stdenv.isAarch64;
|
||||
broken = stdenv.isAarch64 && stdenv.isDarwin;
|
||||
};
|
||||
}; in self
|
||||
|
||||
@@ -101,7 +101,7 @@ let
|
||||
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
# autodetection doesn't seem to able to find this, but it's there.
|
||||
checkTarget = "check";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user