Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 902952d3a3c1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb81bec6d3b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 16, 2019

  1. alacritty: 0.3.2 -> 0.3.3

    @xrelkd
    xrelkd committed Jun 16, 2019
    Copy the full SHA
    49ec880 View commit details

  2. Merge pull request #62916 from xrelkd/update/alacritty 

    alacritty: 0.3.2 -> 0.3.3
    @marsam
    marsam authored Jun 16, 2019
    Copy the full SHA
    bb81bec View commit details
Showing with 23 additions and 22 deletions.
  1. +23 −22 pkgs/applications/misc/alacritty/default.nix
45 changes: 23 additions & 22 deletions pkgs/applications/misc/alacritty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''