mirror of
https://github.com/pimalaya/himalaya.git
synced 2026-06-17 13:17:55 +08:00
remove libiconv
This commit is contained in:
@@ -52,8 +52,6 @@ jobs:
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
extraPullNames: nix-community
|
||||
- name: Build release
|
||||
env:
|
||||
NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
|
||||
run: |
|
||||
nix-build --argstr target ${{ matrix.target }}
|
||||
- name: Upload release artifacts
|
||||
|
||||
@@ -45,7 +45,6 @@ let
|
||||
notmuch = pkgs.notmuch;
|
||||
gpgme = pkgs.gpgme;
|
||||
pkg-config = pkgs.pkg-config;
|
||||
libiconv = pkgs.libiconv-darwin;
|
||||
buildNoDefaultFeatures = !defaultFeatures;
|
||||
buildFeatures = lib.strings.splitString "," features;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, libiconv
|
||||
, pkg-config
|
||||
, hostPlatform
|
||||
, rustPlatform
|
||||
@@ -35,12 +34,9 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoTestFlags = [ "--lib" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional hostPlatform.isDarwin libiconv
|
||||
++ lib.optional (installManPages || installShellCompletions) installShellFiles;
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optional hostPlatform.isDarwin libiconv
|
||||
++ 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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user