Merge pull request #179562 from linsui/lapce

lapce: 0.1.0 -> 0.1.2
This commit is contained in:
Mario Rodas 2022-07-01 20:48:48 -05:00 committed by GitHub
commit d36fd0a6f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,19 +4,12 @@
, rustPlatform
, cmake
, pkg-config
, python3
, perl
, freetype
, fontconfig
, libxkbcommon
, xcbutil
, libX11
, libXcursor
, libXrandr
, libXi
, vulkan-loader
, copyDesktopItems
, makeDesktopItem
, glib
, gtk3
, openssl
, libobjc
, Security
@ -28,21 +21,20 @@
rustPlatform.buildRustPackage rec {
pname = "lapce";
version = "0.1.0";
version = "0.1.2";
src = fetchFromGitHub {
owner = "lapce";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA=";
sha256 = "sha256-jH473FdBI3rGt90L3WwMDPP8M3w0rtG5D758ceCMw94=";
};
cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE=";
cargoSha256 = "sha256-0Kya2KcyBDlt0TpFV60VAA3+JPfwId/+k8k+H97EhB0=";
nativeBuildInputs = [
cmake
pkg-config
python3
perl
copyDesktopItems
];
@ -51,17 +43,11 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = 1;
buildInputs = [
glib
gtk3
openssl
] ++ lib.optionals stdenv.isLinux [
freetype
fontconfig
libxkbcommon
xcbutil
libX11
libXcursor
libXrandr
libXi
vulkan-loader
] ++ lib.optionals stdenv.isDarwin [
libobjc
Security
@ -71,11 +57,6 @@ rustPlatform.buildRustPackage rec {
AppKit
];
# Add missing vulkan dependency to rpath
preFixup = lib.optionalString stdenv.isLinux ''
patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce
'';
postInstall = ''
install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg
'';