public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the usage of cross packages during nix-env listings

Browse Source
This commit is contained in:
William A. Kennington III 2015-06-22 12:25:53 -07:00
parent 282d03befa
commit 094bf83b26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -5155,7 +5155,7 @@ let
gold = false; gold = false;
}); });
binutilsCross = lowPrio (forceNativeDrv ( binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv (
if crossSystem.libc == "libSystem" then darwin.cctools_cross if crossSystem.libc == "libSystem" then darwin.cctools_cross
else binutils.override { else binutils.override {
noSysDirs = true; noSysDirs = true;
@ -6152,7 +6152,7 @@ let
else if name == "libSystem" then darwin.xcode else if name == "libSystem" then darwin.xcode
else throw "Unknown libc"; else throw "Unknown libc";
libcCross = libcCrossChooser crossSystem.libc; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
# Only supported on Linux # Only supported on Linux
glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;