Merge pull request #62916 from xrelkd/update/alacritty

alacritty: 0.3.2 -> 0.3.3
This commit is contained in:
Mario Rodas 2019-06-16 12:55:58 -05:00 committed by GitHub
commit bb81bec6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,23 +2,27 @@
lib,
fetchFromGitHub,
rustPlatform,
cmake,
gzip,
makeWrapper,
ncurses,
expat,
pkgconfig,
freetype,
python3,
expat,
fontconfig,
freetype,
libGL,
libX11,
gzip,
libXcursor,
libXxf86vm,
libXi,
libXrandr,
libGL,
xclip,
wayland,
libXxf86vm,
libxcb,
libxkbcommon,
wayland,
# Darwin Frameworks
cf-private,
AppKit,
@ -34,37 +38,39 @@ with rustPlatform;
let
rpathLibs = [
expat
freetype
fontconfig
freetype
libGL
libX11
libXcursor
libXxf86vm
libXrandr
libGL
libXi
libXrandr
libXxf86vm
libxcb
] ++ lib.optionals stdenv.isLinux [
wayland
libxkbcommon
wayland
];
in buildRustPackage rec {
pname = "alacritty";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "jwilm";
repo = pname;
rev = "v${version}";
sha256 = "16lhxfpwysd5ngw8yq76vbzjdmfzs9plsvairf768hnl290jcpbh";
sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750";
};
cargoSha256 = "02q5kkr0zygpm9i2hd1sr246f18pyia1lq9dwjagqk7d2x3xlc7p";
cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1";
nativeBuildInputs = [
cmake
makeWrapper
pkgconfig
ncurses
gzip
makeWrapper
ncurses
pkgconfig
python3
];
buildInputs = rpathLibs
@ -76,11 +82,6 @@ in buildRustPackage rec {
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";
installPhase = ''