Merge pull request #62916 from xrelkd/update/alacritty
alacritty: 0.3.2 -> 0.3.3
This commit is contained in:
commit
bb81bec6d3
@ -2,23 +2,27 @@
|
|||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
|
|
||||||
cmake,
|
cmake,
|
||||||
|
gzip,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
ncurses,
|
ncurses,
|
||||||
expat,
|
|
||||||
pkgconfig,
|
pkgconfig,
|
||||||
freetype,
|
python3,
|
||||||
|
|
||||||
|
expat,
|
||||||
fontconfig,
|
fontconfig,
|
||||||
|
freetype,
|
||||||
|
libGL,
|
||||||
libX11,
|
libX11,
|
||||||
gzip,
|
|
||||||
libXcursor,
|
libXcursor,
|
||||||
libXxf86vm,
|
|
||||||
libXi,
|
libXi,
|
||||||
libXrandr,
|
libXrandr,
|
||||||
libGL,
|
libXxf86vm,
|
||||||
xclip,
|
libxcb,
|
||||||
wayland,
|
|
||||||
libxkbcommon,
|
libxkbcommon,
|
||||||
|
wayland,
|
||||||
|
|
||||||
# Darwin Frameworks
|
# Darwin Frameworks
|
||||||
cf-private,
|
cf-private,
|
||||||
AppKit,
|
AppKit,
|
||||||
@ -34,37 +38,39 @@ with rustPlatform;
|
|||||||
let
|
let
|
||||||
rpathLibs = [
|
rpathLibs = [
|
||||||
expat
|
expat
|
||||||
freetype
|
|
||||||
fontconfig
|
fontconfig
|
||||||
|
freetype
|
||||||
|
libGL
|
||||||
libX11
|
libX11
|
||||||
libXcursor
|
libXcursor
|
||||||
libXxf86vm
|
|
||||||
libXrandr
|
|
||||||
libGL
|
|
||||||
libXi
|
libXi
|
||||||
|
libXrandr
|
||||||
|
libXxf86vm
|
||||||
|
libxcb
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
wayland
|
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
|
wayland
|
||||||
];
|
];
|
||||||
in buildRustPackage rec {
|
in buildRustPackage rec {
|
||||||
pname = "alacritty";
|
pname = "alacritty";
|
||||||
version = "0.3.2";
|
version = "0.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jwilm";
|
owner = "jwilm";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "16lhxfpwysd5ngw8yq76vbzjdmfzs9plsvairf768hnl290jcpbh";
|
sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "02q5kkr0zygpm9i2hd1sr246f18pyia1lq9dwjagqk7d2x3xlc7p";
|
cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
makeWrapper
|
|
||||||
pkgconfig
|
|
||||||
ncurses
|
|
||||||
gzip
|
gzip
|
||||||
|
makeWrapper
|
||||||
|
ncurses
|
||||||
|
pkgconfig
|
||||||
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = rpathLibs
|
buildInputs = rpathLibs
|
||||||
@ -76,11 +82,6 @@ in buildRustPackage rec {
|
|||||||
|
|
||||||
outputs = [ "out" "terminfo" ];
|
outputs = [ "out" "terminfo" ];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace copypasta/src/x11.rs \
|
|
||||||
--replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
|
|
||||||
'';
|
|
||||||
|
|
||||||
postBuild = lib.optionalString stdenv.isDarwin "make app";
|
postBuild = lib.optionalString stdenv.isDarwin "make app";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user