diff options
author | Christian Kögler <ck3d@gmx.de> | 2024-01-09 18:47:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-09 18:47:11 +0100 |
commit | 0edcca6ffa6c1ca7a6295e6f93a85f2d4cfa6da5 (patch) | |
tree | 1f384366e7e8d72ca3eb24c17ce105a49fe45390 /pkgs/applications/editors | |
parent | c64c04e8bf17967aecce87a9389b062ae3ee749b (diff) | |
parent | e2bb36a115cfa0948c169c5d3566da6a1d695d42 (diff) |
Merge pull request #279185 from n8henrie/neovide-aarch64-darwin
neovide: fix build for aarch64-darwin
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/neovim/neovide/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 0142fde1726f7..9f6e2a3f0739a 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -6,6 +6,7 @@ , fetchgit , runCommand , gn +, neovim , ninja , makeWrapper , pkg-config @@ -67,11 +68,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { removeReferencesTo ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - # All tests passes but at the end cargo prints for unknown reason: - # error: test failed, to rerun pass '--bin neovide' - # Increasing the loglevel did not help. In a nix-shell environment - # the failure do not occure. - doCheck = false; + nativeCheckInputs = [ neovim ]; buildInputs = [ SDL2 @@ -81,6 +78,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { darwin.apple_sdk.frameworks.AppKit ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Work around https://github.com/NixOS/nixpkgs/issues/166205 + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postFixup = let libPath = lib.makeLibraryPath ([ libglvnd @@ -117,6 +119,5 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d multisn8 ]; platforms = platforms.all; - badPlatforms = platforms.darwin; }; } |