mirror of
https://github.com/soywod/himalaya.git
synced 2025-04-19 15:53:39 +00:00
link to -lunwind
This commit is contained in:
parent
4781f92ce8
commit
250ef63030
2 changed files with 11 additions and 12 deletions
6
.github/workflows/pre-release.yml
vendored
6
.github/workflows/pre-release.yml
vendored
|
@ -26,9 +26,9 @@ jobs:
|
|||
# target: i686-unknown-linux-musl
|
||||
# os: ubuntu-latest
|
||||
# FIXME
|
||||
# - system: i686-windows
|
||||
# target: i686-w64-mingw32
|
||||
# os: ubuntu-latest
|
||||
- system: i686-windows
|
||||
target: i686-w64-mingw32
|
||||
os: ubuntu-latest
|
||||
# - system: x86_64-macos-13
|
||||
# target: x86_64-apple-darwin
|
||||
# os: macos-13
|
||||
|
|
17
package.nix
17
package.nix
|
@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
|
||||
|
||||
# NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [
|
||||
# "-L${windows.mcfgthreads}/lib"
|
||||
# "-L${}/lib"
|
||||
# # "-L${windows.mingwrt}/lib"
|
||||
# #"-L${windows.w32api}/lib"
|
||||
# "-lmcfgthread"
|
||||
# "-lunwind"
|
||||
# ];
|
||||
NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isWindows [
|
||||
#"-L${windows.mcfgthreads}/lib"
|
||||
#"-L${}/lib"
|
||||
#"-L${windows.mingwrt}/lib"
|
||||
#"-L${windows.w32api}/lib"
|
||||
#"-lmcfgthread"
|
||||
"-lunwind"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
auditable = false;
|
||||
|
@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = [ ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk
|
||||
++ lib.optional stdenv.hostPlatform.isWindows windows.pthreads
|
||||
++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
|
||||
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue