From 5a1a8357914c354ff68c780346e9eb3253c9ef3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Tue, 26 Nov 2024 09:58:29 +0100 Subject: [PATCH] add libunwind --- default.nix | 1 + package.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index e9a4b6e1..18de2565 100644 --- a/default.nix +++ b/default.nix @@ -54,6 +54,7 @@ let pkg-config = pkgs.pkg-config; buildNoDefaultFeatures = !defaultFeatures; buildFeatures = lib.strings.splitString "," features; + libunwind = pkgs.libunwind; }; # HACK: https://github.com/NixOS/nixpkgs/issues/177129 diff --git a/package.nix b/package.nix index faf9de60..aea291f5 100644 --- a/package.nix +++ b/package.nix @@ -1,4 +1,5 @@ { lib +, libunwind , pkg-config , rustPlatform , windows @@ -31,10 +32,11 @@ rustPlatform.buildRustPackage rec { NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [ "-L${windows.mcfgthreads}/lib" + "-L${libunwind}/lib" # "-L${windows.mingwrt}/lib" #"-L${windows.w32api}/lib" "-lmcfgthread" - #"-lunwind" + "-lunwind" ]; # unit tests only