mirror of
https://github.com/pimalaya/himalaya.git
synced 2024-12-09 21:18:39 +03:00
try to fix windows
This commit is contained in:
42
.github/workflows/pre-release.yml
vendored
42
.github/workflows/pre-release.yml
vendored
@@ -10,31 +10,31 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- system: aarch64-macos-14
|
||||
target: aarch64-apple-darwin
|
||||
os: macos-14
|
||||
- system: aarch64-linux
|
||||
target: aarch64-unknown-linux-musl
|
||||
os: ubuntu-latest
|
||||
- system: armv6l-linux
|
||||
target: armv6l-unknown-linux-musleabihf
|
||||
os: ubuntu-latest
|
||||
- system: armv7l-linux
|
||||
target: armv7l-unknown-linux-musleabihf
|
||||
os: ubuntu-latest
|
||||
- system: i686-linux
|
||||
target: i686-unknown-linux-musl
|
||||
os: ubuntu-latest
|
||||
# - system: aarch64-macos-14
|
||||
# target: aarch64-apple-darwin
|
||||
# os: macos-14
|
||||
# - system: aarch64-linux
|
||||
# target: aarch64-unknown-linux-musl
|
||||
# os: ubuntu-latest
|
||||
# - system: armv6l-linux
|
||||
# target: armv6l-unknown-linux-musleabihf
|
||||
# os: ubuntu-latest
|
||||
# - system: armv7l-linux
|
||||
# target: armv7l-unknown-linux-musleabihf
|
||||
# os: ubuntu-latest
|
||||
# - system: i686-linux
|
||||
# target: i686-unknown-linux-musl
|
||||
# os: ubuntu-latest
|
||||
# FIXME
|
||||
# - system: i686-windows
|
||||
# target: i686-w64-mingw32
|
||||
# os: ubuntu-latest
|
||||
- system: x86_64-macos-13
|
||||
target: x86_64-apple-darwin
|
||||
os: macos-13
|
||||
- system: x86_64-linux
|
||||
target: x86_64-unknown-linux-musl
|
||||
os: ubuntu-latest
|
||||
# - system: x86_64-macos-13
|
||||
# target: x86_64-apple-darwin
|
||||
# os: macos-13
|
||||
# - system: x86_64-linux
|
||||
# target: x86_64-unknown-linux-musl
|
||||
# os: ubuntu-latest
|
||||
- system: x86_64-windows
|
||||
target: x86_64-w64-mingw32
|
||||
os: ubuntu-latest
|
||||
|
||||
10
package.nix
10
package.nix
@@ -29,6 +29,15 @@ 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"
|
||||
# ];
|
||||
|
||||
doCheck = false;
|
||||
auditable = false;
|
||||
|
||||
@@ -40,6 +49,7 @@ 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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user