diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 16:00:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 16:00:04 -0400 |
| commit | d7144e708b21127f379571f72f8425cbd79bcfbf (patch) | |
| tree | d41ad3f488cbabb7dd5a32e5e9b651242a4228b4 /pkgs/development/tools/misc | |
| parent | 89e196d971e167867318c8fc2e08cb0782c75bec (diff) | |
| parent | 78319bd948efc53b94bf942b155a8bc4060d5a08 (diff) | |
| download | nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar.gz nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar.bz2 nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar.lz nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar.xz nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.tar.zst nixlib-d7144e708b21127f379571f72f8425cbd79bcfbf.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/strace/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index fce2fa4fa4b4..a059f5658b07 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -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"; |