diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 06:01:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 06:01:08 +0000 |
| commit | 41ef1f3277e06938c8e265052e69c894860cde16 (patch) | |
| tree | 00974a5e05dbe14a30c43606ab66ac7bb9d0356d /pkgs/test | |
| parent | cbec6b85a3ad3071e1fc2d7057671f73c59e2138 (diff) | |
| parent | 014ba34da35c14b6cad82b07a1245f3251e78645 (diff) | |
| download | nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar.gz nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar.bz2 nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar.lz nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar.xz nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.tar.zst nixpkgs-41ef1f3277e06938c8e265052e69c894860cde16.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/cross/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 8daa03c5622..b13c41a1905 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -145,6 +145,12 @@ let pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv + + ] ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [ + # Musl-to-glibc cross on the same architecture tends to turn up + # lots of interesting corner cases. Only expected to work for + # x86_64-linux buildPlatform. + pkgs.pkgsMusl.pkgsCross.gnu64.hello ]; in { |