git.iko.soy/typeable/nixpkgs
on master help sign in
top-level: libcCrossChooser: More `or` fallback hack

This fixes some eval errors in release-cross.nix

commit984df7ca0605554bd760efc1a53a8b94d8e04c15 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 1 Nov 2018, 16:16 (8 years ago) parent24e2bc1
1 file changed+3−3
pkgs/top-level/all-packages.nix+3−3
pkgs/top-level/all-packages.nix+3−3
@@ -9536,11 +9536,11 @@ with pkgs;
95369536 # libc is hackily often used from the previous stage. This `or`
95379537 # hack fixes the hack, *sigh*.
95389538 /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
9539− else if name == "bionic" then targetPackages.bionic
9540− else if name == "uclibc" then targetPackages.uclibcCross
9539+ else if name == "bionic" then targetPackages.bionic or bionic
9540+ else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross
95419541 else if name == "musl" then targetPackages.muslCross or muslCross
95429542 else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
9543− else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries
9543+ else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
95449544 else if name == "libSystem" then targetPackages.darwin.xcode
95459545 else throw "Unknown libc";
95469546