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: ef4d78adedcf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 330afca638ed
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 3, 2018

  1. alacritty: fix build on darwin

    @periklis
    periklis committed Nov 3, 2018
    Copy the full SHA
    74ef823 View commit details

  2. Merge pull request #49694 from periklis/alacritty-fix-regression 

    alacritty: fix build on darwin
    @Mic92
    Mic92 authored Nov 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    330afca View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/applications/misc/alacritty/default.nix
5 changes: 4 additions & 1 deletion pkgs/applications/misc/alacritty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,10 @@ in buildRustPackage rec {
buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin darwinFrameworks;

outputs = [ "out" "terminfo" ];
outputs = [ "out" "terminfo" ];

# https://github.com/NixOS/nixpkgs/issues/49693
doCheck = !stdenv.isDarwin;

postPatch = ''
substituteInPlace copypasta/src/x11.rs \