From 984df7ca0605554bd760efc1a53a8b94d8e04c15 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 1 Nov 2018 16:16:58 -0400 Subject: [PATCH] top-level: libcCrossChooser: More `or` fallback hack This fixes some eval errors in release-cross.nix --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd7db6263d..a2e93f038c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9536,11 +9536,11 @@ with pkgs; # libc is hackily often used from the previous stage. This `or` # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross - else if name == "bionic" then targetPackages.bionic - else if name == "uclibc" then targetPackages.uclibcCross + else if name == "bionic" then targetPackages.bionic or bionic + else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries + else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode else throw "Unknown libc";