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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-05-23 16:00:04 -04:00
parent 89e196d971 78319bd948
commit d7144e708b
24 changed files with 803 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/strace/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k
buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";