ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

lapce: fix build on darwin

Browse Source
This commit is contained in:
Mario Rodas 2022-04-23 04:20:00 +00:00
parent f05a748058
commit 55c3e3b030
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/editors/lapce/default.nix
View File

@ -17,6 +17,13 @@
, vulkan-loader
, copyDesktopItems
, makeDesktopItem
, openssl
, libobjc
, Security
, CoreServices
, ApplicationServices
, Carbon
, AppKit
}:
rustPlatform.buildRustPackage rec {
@ -40,7 +47,12 @@ rustPlatform.buildRustPackage rec {
copyDesktopItems
];
# Get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
buildInputs = [
openssl
] ++ lib.optionals stdenv.isLinux [
freetype
fontconfig
libxkbcommon
@ -50,10 +62,17 @@ rustPlatform.buildRustPackage rec {
libXrandr
libXi
vulkan-loader
] ++ lib.optionals stdenv.isDarwin [
libobjc
Security
CoreServices
ApplicationServices
Carbon
AppKit
];
# Add missing vulkan dependency to rpath
preFixup = ''
preFixup = lib.optionalString stdenv.isLinux ''
patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce
'';
@ -76,6 +95,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/lapce/lapce";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ elliot ];
broken = stdenv.isDarwin;
};
}

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

@ -3739,7 +3739,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
lapce = callPackage ../applications/editors/lapce { };
lapce = callPackage ../applications/editors/lapce {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;
};
lcdproc = callPackage ../servers/monitoring/lcdproc { };