BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #279185 from n8henrie/neovide-aarch64-darwin

Browse source 
neovide: fix build for aarch64-darwin
This commit is contained in:
Christian Kögler 2024-01-09 18:47:11 +01:00 committed by GitHub
commit 0edcca6ffa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
};
}