pyrox.dev
Merge pull request #83719 from cole-h/alacritty
alacritty: 0.4.1 -> 0.4.2
authored by Benjamin Hipple and committed by GitHub 40fab12b 19927681
+60
-51
pkgs/applications/misc/alacritty/default.nix
+60
-51
pkgs/applications/misc/alacritty/default.nix
···
1
-
{ stdenv,
2
-
lib,
3
-
fetchFromGitHub,
4
-
rustPlatform,
1
+
{ stdenv
2
+
, lib
3
+
, fetchFromGitHub
4
+
, rustPlatform
5
5
6
-
cmake,
7
-
gzip,
8
-
installShellFiles,
9
-
makeWrapper,
10
-
ncurses,
11
-
pkgconfig,
12
-
python3,
6
+
, cmake
7
+
, gzip
8
+
, installShellFiles
9
+
, makeWrapper
10
+
, ncurses
11
+
, pkgconfig
12
+
, python3
13
13
14
-
expat,
15
-
fontconfig,
16
-
freetype,
17
-
libGL,
18
-
libX11,
19
-
libXcursor,
20
-
libXi,
21
-
libXrandr,
22
-
libXxf86vm,
23
-
libxcb,
24
-
libxkbcommon,
25
-
wayland,
26
-
xdg_utils,
14
+
, expat
15
+
, fontconfig
16
+
, freetype
17
+
, libGL
18
+
, libX11
19
+
, libXcursor
20
+
, libXi
21
+
, libXrandr
22
+
, libXxf86vm
23
+
, libxcb
24
+
, libxkbcommon
25
+
, wayland
26
+
, xdg_utils
27
27
28
28
# Darwin Frameworks
29
-
AppKit,
30
-
CoreGraphics,
31
-
CoreServices,
32
-
CoreText,
33
-
Foundation,
34
-
OpenGL }:
35
-
36
-
with rustPlatform;
37
-
29
+
, AppKit
30
+
, CoreGraphics
31
+
, CoreServices
32
+
, CoreText
33
+
, Foundation
34
+
, OpenGL
35
+
}:
38
36
let
39
37
rpathLibs = [
40
38
expat
···
51
49
libxkbcommon
52
50
wayland
53
51
];
54
-
in buildRustPackage rec {
52
+
in
53
+
rustPlatform.buildRustPackage rec {
55
54
pname = "alacritty";
56
-
version = "0.4.1";
55
+
version = "0.4.2";
57
56
58
57
src = fetchFromGitHub {
59
-
owner = "jwilm";
58
+
owner = "alacritty";
60
59
repo = pname;
61
60
rev = "v${version}";
62
-
sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
61
+
sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
63
62
};
64
63
65
-
cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip";
64
+
cargoSha256 = "07gq63qd11zz229b8jp9wqggz39qfpzd223z1zk1xch7rhqq0pn4";
66
65
67
66
nativeBuildInputs = [
68
67
cmake
···
75
74
];
76
75
77
76
buildInputs = rpathLibs
78
-
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
77
+
++ lib.optionals stdenv.isDarwin [
78
+
AppKit
79
+
CoreGraphics
80
+
CoreServices
81
+
CoreText
82
+
Foundation
83
+
OpenGL
84
+
];
79
85
80
86
outputs = [ "out" "terminfo" ];
87
+
81
88
postPatch = ''
82
89
substituteInPlace alacritty/src/config/mouse.rs \
83
90
--replace xdg-open ${xdg_utils}/bin/xdg-open
···
90
97
91
98
install -D target/release/alacritty $out/bin/alacritty
92
99
93
-
'' + (if stdenv.isDarwin then ''
94
-
mkdir $out/Applications
95
-
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
96
-
'' else ''
97
-
install -D extra/linux/alacritty.desktop -t $out/share/applications/
98
-
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
99
-
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
100
-
'') + ''
100
+
'' + (
101
+
if stdenv.isDarwin then ''
102
+
mkdir $out/Applications
103
+
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
104
+
'' else ''
105
+
install -D extra/linux/Alacritty.desktop -t $out/share/applications/
106
+
install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
107
+
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
108
+
''
109
+
) + ''
101
110
102
111
installShellCompletion --zsh extra/completions/_alacritty
103
112
installShellCompletion --bash extra/completions/alacritty.bash
···
116
125
117
126
dontPatchELF = true;
118
127
119
-
meta = with stdenv.lib; {
120
-
description = "GPU-accelerated terminal emulator";
121
-
homepage = "https://github.com/jwilm/alacritty";
128
+
meta = with lib; {
129
+
description = "A cross-platform, GPU-accelerated terminal emulator";
130
+
homepage = "https://github.com/alacritty/alacritty";
122
131
license = licenses.asl20;
123
-
maintainers = with maintainers; [ filalex77 mic92 ];
132
+
maintainers = with maintainers; [ filalex77 mic92 cole-h ];
124
133
platforms = platforms.unix;
125
134
};
126
135
}