dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nongnu-libunwind: Disable package for RISC-V

Browse Source 
The author has stated that he does not have time to implement support.
There is no use for the `supportsHost` passthru attribute anymore, so
let's remove that as well.
This commit is contained in:
Zhaofeng Li 2021-06-04 19:02:19 -07:00
parent 64509dbd18
commit 9a8b5d6e15
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/libunwind/default.nix
View File

@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
description = "A portable and efficient API to determine the call-chain of a program"; description = "A portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej ];
platforms = platforms.linux; platforms = platforms.linux;
badPlatforms = [ "riscv32-linux" "riscv64-linux" ];
license = licenses.mit; license = licenses.mit;
}; };
passthru.supportsHost = !stdenv.hostPlatform.isRiscV;
} }

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

@ -1,9 +1,5 @@
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }: { lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
# libunwind does not have the supportsHost attribute on darwin, thus
# when this package is evaluated it causes an evaluation error
assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "strace"; pname = "strace";
version = "5.12"; version = "5.12";
@ -16,7 +12,9 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = [ perl.out ] ++ lib.optional libunwind.supportsHost libunwind; # support -k # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
# The build will silently fall back and -k will not work on RISC-V.
buildInputs = [ perl.out libunwind ]; # support -k
postPatch = "patchShebangs --host strace-graph"; postPatch = "patchShebangs --host strace-graph";