pyrox.dev
Merge pull request #279185 from n8henrie/neovide-aarch64-darwin
neovide: fix build for aarch64-darwin
authored by Christian Kögler and committed by GitHub 0edcca6f c64c04e8
+7
-6
pkgs/applications/editors/neovim/neovide/default.nix
+7
-6
pkgs/applications/editors/neovim/neovide/default.nix
···
6
6
, fetchgit
7
7
, runCommand
8
8
, gn
9
+
, neovim
9
10
, ninja
10
11
, makeWrapper
11
12
, pkg-config
···
67
68
removeReferencesTo
68
69
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
69
70
70
-
# All tests passes but at the end cargo prints for unknown reason:
71
-
# error: test failed, to rerun pass '--bin neovide'
72
-
# Increasing the loglevel did not help. In a nix-shell environment
73
-
# the failure do not occure.
74
-
doCheck = false;
71
+
nativeCheckInputs = [ neovim ];
75
72
76
73
buildInputs = [
77
74
SDL2
···
80
77
] ++ lib.optionals stdenv.isDarwin [
81
78
darwin.apple_sdk.frameworks.AppKit
82
79
];
80
+
81
+
env = lib.optionalAttrs stdenv.isDarwin {
82
+
# Work around https://github.com/NixOS/nixpkgs/issues/166205
83
+
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
84
+
};
83
85
84
86
postFixup = let
85
87
libPath = lib.makeLibraryPath ([
···
117
119
license = with licenses; [ mit ];
118
120
maintainers = with maintainers; [ ck3d multisn8 ];
119
121
platforms = platforms.all;
120
-
badPlatforms = platforms.darwin;
121
122
};
122
123
}