forked from mirrors/nixpkgs
neovide: fix build on darwin
This commit is contained in:
parent
3ad98fc938
commit
0e74fea612
|
@ -22,6 +22,11 @@
|
||||||
, enableWayland ? stdenv.isLinux
|
, enableWayland ? stdenv.isLinux
|
||||||
, wayland
|
, wayland
|
||||||
, xorg
|
, xorg
|
||||||
|
, xcbuild
|
||||||
|
, Security
|
||||||
|
, ApplicationServices
|
||||||
|
, AppKit
|
||||||
|
, Carbon
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "neovide";
|
pname = "neovide";
|
||||||
|
@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
python2 # skia-bindings
|
python2 # skia-bindings
|
||||||
python3 # rust-xcb
|
python3 # rust-xcb
|
||||||
llvmPackages.clang # skia
|
llvmPackages.clang # skia
|
||||||
];
|
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||||
|
|
||||||
# All tests passes but at the end cargo prints for unknown reason:
|
# All tests passes but at the end cargo prints for unknown reason:
|
||||||
# error: test failed, to rerun pass '--bin neovide'
|
# error: test failed, to rerun pass '--bin neovide'
|
||||||
|
@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
}))
|
}))
|
||||||
];
|
];
|
||||||
}))
|
}))
|
||||||
];
|
] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ];
|
||||||
|
|
||||||
postFixup = let
|
postFixup = let
|
||||||
libPath = lib.makeLibraryPath ([
|
libPath = lib.makeLibraryPath ([
|
||||||
|
@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
homepage = "https://github.com/Kethku/neovide";
|
homepage = "https://github.com/Kethku/neovide";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ ck3d ];
|
maintainers = with maintainers; [ ck3d ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.all;
|
||||||
mainProgram = "neovide";
|
mainProgram = "neovide";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -31886,7 +31886,9 @@ with pkgs;
|
||||||
|
|
||||||
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
||||||
|
|
||||||
neovide = callPackage ../applications/editors/neovim/neovide { };
|
neovide = callPackage ../applications/editors/neovim/neovide {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) Security ApplicationServices Carbon AppKit;
|
||||||
|
};
|
||||||
|
|
||||||
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
|
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue