Merge pull request #230685 from figsoda/inlyne

inlyne: 0.2.1 -> 0.3.1
This commit is contained in:
Weijia Wang 2023-05-10 10:00:51 +03:00 committed by GitHub
commit 9330af3d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 32 deletions

View File

@ -1,40 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, stdenv
, pkg-config
, fontconfig
, xorg
, libGL
, openssl
, AppKit
, ApplicationServices
, CoreFoundation
, CoreGraphics
, CoreServices
, CoreText
, CoreVideo
, Foundation
, Metal
, QuartzCore
, Security
, libobjc
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "inlyne";
version = "0.2.1";
version = "0.3.1";
src = fetchFromGitHub {
owner = "trimental";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jFocERr2cW7zdLiYfAay5Dh1issKAHp6vRWYWR1Axcg=";
hash = "sha256-B+H3G4jVysqrzWIP+1hktSGnycZLizxhmBCO/lYIr0I=";
};
cargoSha256 = "sha256-mH8tu8koprmHo6JJ9AwYMexy2SFR2yukZmFT060cuZ4=";
cargoHash = "sha256-LFL2DVKu/UM7effikZN/IhSD6DrlwO+CF+S60PXULa0=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
nativeBuildInputs = [
installShellFiles
] ++ lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.isLinux [
fontconfig
@ -44,20 +38,16 @@ rustPlatform.buildRustPackage rec {
xorg.libxcb
openssl
] ++ lib.optionals stdenv.isDarwin [
AppKit
ApplicationServices
CoreFoundation
CoreGraphics
CoreServices
CoreText
CoreVideo
Foundation
Metal
QuartzCore
Security
libobjc
darwin.apple_sdk_11_0.frameworks.AppKit
];
postInstall = ''
installShellCompletion --cmd inlyne \
--bash <($out/bin/inlyne --gen-completions bash) \
--fish <($out/bin/inlyne --gen-completions fish) \
--zsh <($out/bin/inlyne --gen-completions zsh)
'';
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/inlyne \
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
@ -66,6 +56,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A GPU powered browserless markdown viewer";
homepage = "https://github.com/trimental/inlyne";
changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};

View File

@ -31450,10 +31450,7 @@ with pkgs;
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
inlyne = callPackage ../applications/misc/inlyne {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security;
};
inlyne = darwin.apple_sdk_11_0.callPackage ../applications/misc/inlyne { };
inspectrum = callPackage ../applications/radio/inspectrum { };