diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 2da2a1f46773..d13b4c05302d 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa47a38e3918..609a42d05837 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };