about summary refs log tree commit diff
path: root/pkgs/development/libraries/libunwind/default.nix
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2021-11-28 15:04:03 +0800
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-12-02 17:47:16 -0800
commit8169ad8838ceb9f7a9a5315d72f456057b4923aa (patch)
treed6b5b9ff5580006da5100580d98aa1d4a819fa19 /pkgs/development/libraries/libunwind/default.nix
parentae418d54d34bfead1996cfdd48ca7998e64e36af (diff)
libunwind: 1.4.0 -> 1.6.2
Diffstat (limited to 'pkgs/development/libraries/libunwind/default.nix')
-rw-r--r--pkgs/development/libraries/libunwind/default.nix18
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 643752da1dc57..4e0fe9a4aa8d8 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }:
+{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }:
 
 stdenv.mkDerivation rec {
   pname = "libunwind";
-  version = "1.4.0";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
-    sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz";
+    sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY=";
   };
 
-  patches = [
-    ./backtrace-only-with-glibc.patch
-
-    (fetchpatch {
-      # upstream build fix against -fno-common compilers like >=gcc-10
-      url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch";
-      sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0";
-    })
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh"
   '';
@@ -46,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "A portable and efficient API to determine the call-chain of a program";
     maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
-    badPlatforms = [ "riscv32-linux" "riscv64-linux" ];
+    badPlatforms = [ "riscv32-linux" ];
     license = licenses.mit;
   };
 }