nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191561 from polachok/neovide-darwin

Browse Source 
neovide: fix build on darwin
This commit is contained in:
Christian Kögler 2022-09-17 01:45:47 +02:00 committed by GitHub
commit 3b3a9600ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
pkgs/top-level/all-packages.nix
View File

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