From 17af03960083a68bd711f4eb173a1a04786ea29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 25 Nov 2024 14:35:44 +0100 Subject: [PATCH] remove libiconv --- .github/workflows/pre-release.yml | 2 -- default.nix | 1 - package.nix | 4 ---- 3 files changed, 7 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 5c8fd45e..afc35194 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -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 diff --git a/default.nix b/default.nix index 28906fec..00f0bcd6 100644 --- a/default.nix +++ b/default.nix @@ -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; }; diff --git a/package.nix b/package.nix index 87995b42..46630cbe 100644 --- a/package.nix +++ b/package.nix @@ -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;