Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inlyne: 0.2.1 -> 0.3.1 #230685

Merged
merged 1 commit into from
May 10, 2023
Merged

inlyne: 0.2.1 -> 0.3.1 #230685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 19 additions & 28 deletions pkgs/applications/misc/inlyne/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 ]}
Expand All @@ -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 ];
};
Expand Down
5 changes: 1 addition & 4 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31416,10 +31416,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 { };

Expand Down