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

Merge branch 'staging' into fix-ncurses-darwin-extensions

Browse Source
This commit is contained in:
Matthew Justin Bauer
2018-05-02 15:40:38 -05:00
committed by GitHub
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/binutils/default.nix
View File

@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
# be satisfied on aarch64 platform. Add backported fix from bugzilla.
# https://sourceware.org/bugzilla/show_bug.cgi?id=22764
./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
];
] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
outputs = [ "out" "info" "man" ];
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
"--enable-fix-loongson2f-nop"
] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
doCheck = false; # fails
enableParallelBuilding = true;
passthru = {