diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-06 09:46:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 09:46:41 -0400 |
| commit | d598eca41ec6c1db91b3caa121d6ebab37c7cbe0 (patch) | |
| tree | 3f52f83088794c3659bafedb6df3ca53068b9095 /pkgs/servers/sql | |
| parent | 1dc26c32edffdb73adb0a82b430834d3404aa8f3 (diff) | |
| parent | 9a0ced7e4502bfd5f835f3a18770fe72efd28e76 (diff) | |
| download | nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar.gz nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar.bz2 nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar.lz nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar.xz nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.tar.zst nixlib-d598eca41ec6c1db91b3caa121d6ebab37c7cbe0.zip | |
Merge pull request #62752 from matthewbauer/darwin-fixes100
Fixes for x86_64-darwin failures on Hydra
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mysql/5.5.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index a24dee07de47..d5fbe0bf2494 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -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 diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5e5f9fc07d49..d46f0cc6317a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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"; |