diff options
| author | Christian Kögler <ck3d@gmx.de> | 2022-09-17 01:45:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-17 01:45:47 +0200 |
| commit | 3b3a9600ab1263c708d48ca9c2dbe8d2cad1096b (patch) | |
| tree | 945ddd1a16c20c30bbabf2e699c9ced875a6d827 | |
| parent | 2912f1ccedcef3f7f57017e2e3a9c912b0251351 (diff) | |
| parent | 0e74fea61206171ead75eeb197d5b942978a1e92 (diff) | |
Merge pull request #191561 from polachok/neovide-darwin
neovide: fix build on darwin
| -rw-r--r-- | pkgs/applications/editors/neovim/neovide/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index d806e6e7d56e..77f0735ec989 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -22,6 +22,11 @@ , enableWayland ? stdenv.isLinux , wayland , xorg +, xcbuild +, Security +, ApplicationServices +, AppKit +, Carbon }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia - ]; + ] ++ 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' @@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec { })) ]; })) - ]; + ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ]; postFixup = let libPath = lib.makeLibraryPath ([ @@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.linux; + platforms = platforms.all; mainProgram = "neovide"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc020572f8f7..259944aac4f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31888,7 +31888,9 @@ with pkgs; 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 { }; |