diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-06-16 12:55:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-16 12:55:58 -0500 |
| commit | bb81bec6d3b49ec316fc184bd33320fe0d78aedf (patch) | |
| tree | bfa6029c91ce9a950c5db83bbbf2dce1bef0d848 | |
| parent | 902952d3a3c1f579a6a68da54c4d1403f30ccfdc (diff) | |
| parent | 49ec880303b6300fa9d6c95b1ed82768df08fff9 (diff) | |
| download | nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar.gz nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar.bz2 nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar.lz nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar.xz nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.tar.zst nixpkgs-bb81bec6d3b49ec316fc184bd33320fe0d78aedf.zip | |
Merge pull request #62916 from xrelkd/update/alacritty
alacritty: 0.3.2 -> 0.3.3
| -rw-r--r-- | pkgs/applications/misc/alacritty/default.nix | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index dfd1ddf8503..c69a523691f 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -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 + gzip makeWrapper - pkgconfig ncurses - gzip + 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 = '' |