mirror of
https://github.com/pimalaya/himalaya.git
synced 2026-06-17 13:17:55 +08:00
disable static for windows
This commit is contained in:
@@ -25,10 +25,9 @@ jobs:
|
||||
- system: i686-linux
|
||||
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
|
||||
target: x86_64-apple-darwin
|
||||
os: macos-13
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ let
|
||||
|
||||
pkgs = import (fetchTarball "https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz") {
|
||||
crossSystem = {
|
||||
isStatic = true;
|
||||
inherit isStatic;
|
||||
config = target;
|
||||
};
|
||||
};
|
||||
|
||||
+1
-3
@@ -38,12 +38,10 @@ rustPlatform.buildRustPackage rec {
|
||||
substituteInPlace package.nix --replace "-lgcc_eh" "-lgcc_s"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ lib.optional (!hostPlatform.isLinux) pkg-config
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional (installManPages || installShellCompletions) installShellFiles;
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security ])
|
||||
++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
|
||||
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@
|
||||
|
||||
x86_64-apple-darwin = {
|
||||
rustTarget = "x86_64-apple-darwin";
|
||||
isStatic = false;
|
||||
isStatic = true;
|
||||
};
|
||||
|
||||
x86_64-unknown-linux-musl = {
|
||||
|
||||
Reference in New Issue
Block a user