public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83719 from cole-h/alacritty 

alacritty: 0.4.1 -> 0.4.2
This commit is contained in:
Benjamin Hipple 2020-03-29 19:13:59 -04:00 committed by GitHub
parent 1992768157 45f53ccd8b
commit 40fab12bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
pkgs/applications/misc/alacritty/default.nix
View File

@ -1,40 +1,38 @@
{ stdenv, { stdenv
lib, , lib
fetchFromGitHub, , fetchFromGitHub
rustPlatform, , rustPlatform
cmake, , cmake
gzip, , gzip
installShellFiles, , installShellFiles
makeWrapper, , makeWrapper
ncurses, , ncurses
pkgconfig, , pkgconfig
python3, , python3
expat, , expat
fontconfig, , fontconfig
freetype, , freetype
libGL, , libGL
libX11, , libX11
libXcursor, , libXcursor
libXi, , libXi
libXrandr, , libXrandr
libXxf86vm, , libXxf86vm
libxcb, , libxcb
libxkbcommon, , libxkbcommon
wayland, , wayland
xdg_utils, , xdg_utils
# Darwin Frameworks # Darwin Frameworks
AppKit, , AppKit
CoreGraphics, , CoreGraphics
CoreServices, , CoreServices
CoreText, , CoreText
Foundation, , Foundation
OpenGL }: , OpenGL
}:
with rustPlatform;
let let
rpathLibs = [ rpathLibs = [
expat expat
@ -51,18 +49,19 @@ let
libxkbcommon libxkbcommon
wayland wayland
]; ];
in buildRustPackage rec { in
rustPlatform.buildRustPackage rec {
pname = "alacritty"; pname = "alacritty";
version = "0.4.1"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jwilm"; owner = "alacritty";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
}; };
cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip"; cargoSha256 = "07gq63qd11zz229b8jp9wqggz39qfpzd223z1zk1xch7rhqq0pn4";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -75,9 +74,17 @@ in buildRustPackage rec {
]; ];
buildInputs = rpathLibs buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; ++ lib.optionals stdenv.isDarwin [
AppKit
CoreGraphics
CoreServices
CoreText
Foundation
OpenGL
];
outputs = [ "out" "terminfo" ]; outputs = [ "out" "terminfo" ];
postPatch = '' postPatch = ''
substituteInPlace alacritty/src/config/mouse.rs \ substituteInPlace alacritty/src/config/mouse.rs \
--replace xdg-open ${xdg_utils}/bin/xdg-open --replace xdg-open ${xdg_utils}/bin/xdg-open
@ -90,14 +97,16 @@ in buildRustPackage rec {
install -D target/release/alacritty $out/bin/alacritty install -D target/release/alacritty $out/bin/alacritty
'' + (if stdenv.isDarwin then '' '' + (
mkdir $out/Applications if stdenv.isDarwin then ''
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app mkdir $out/Applications
'' else '' cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
install -D extra/linux/alacritty.desktop -t $out/share/applications/ '' else ''
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg install -D extra/linux/Alacritty.desktop -t $out/share/applications/
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
'') + '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
''
) + ''
installShellCompletion --zsh extra/completions/_alacritty installShellCompletion --zsh extra/completions/_alacritty
installShellCompletion --bash extra/completions/alacritty.bash installShellCompletion --bash extra/completions/alacritty.bash
@ -116,11 +125,11 @@ in buildRustPackage rec {
dontPatchELF = true; dontPatchELF = true;
meta = with stdenv.lib; { meta = with lib; {
description = "GPU-accelerated terminal emulator"; description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/jwilm/alacritty"; homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ filalex77 mic92 ]; maintainers = with maintainers; [ filalex77 mic92 cole-h ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }