ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

neovide: fix build for aarch64-darwin

Browse Source 
Thanks to @wegank for https://github.com/NixOS/nixpkgs/pull/274839/files

This also reenables checks, which pass once given access to neovim.
This commit is contained in:
Nathan Henrie 2024-01-06 08:48:59 -07:00
parent eba9a24297
commit e2bb36a115
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -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;
};
}