try pkgsStatic

This commit is contained in:
Clément DOUIN
2024-11-25 00:18:13 +01:00
parent fcfb7adb16
commit 7ae109eaae
2 changed files with 29 additions and 5 deletions
+25
View File
@@ -13,6 +13,31 @@ jobs:
- system: aarch64-macos
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
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
steps:
- name: Checkout code
uses: actions/checkout@v4
+4 -5
View File
@@ -9,7 +9,6 @@ let
pkgs = import <nixpkgs> {
crossSystem = {
inherit isStatic;
config = target;
};
};
@@ -25,7 +24,7 @@ let
targetSystem = rustTarget;
};
rustPlatform = pkgs.makeRustPlatform {
rustPlatform = pkgs.pkgsStatic.makeRustPlatform {
rustc = rustToolchain;
cargo = rustToolchain;
};
@@ -37,13 +36,13 @@ let
himalaya = import ./package.nix {
inherit lib hostPlatform rustPlatform;
fetchFromGitHub = pkgs.fetchFromGitHub;
stdenv = pkgs.stdenv;
stdenv = pkgs.pkgsStatic.stdenv;
darwin = pkgs.darwin;
installShellFiles = false;
installShellCompletions = false;
installManPages = false;
notmuch = pkgs.notmuch;
gpgme = pkgs.gpgme;
notmuch = pkgs.pkgsStatic.notmuch;
gpgme = pkgs.pkgsStatic.gpgme;
buildNoDefaultFeatures = !defaultFeatures;
buildFeatures = lib.strings.splitString "," features;
};