11 files changed, 176 insertions, 39 deletions
diff --git a/pkgs/alacritty/default.nix b/pkgs/alacritty/default.nix
new file mode 100644
index 0000000..4df87a3
--- /dev/null
+++ b/pkgs/alacritty/default.nix
@@ -0,0 +1,128 @@
+{ stdenv,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  cmake,
+  python3,
+  makeWrapper,
+  ncurses,
+  expat,
+  pkgconfig,
+  freetype,
+  fontconfig,
+  libX11, libxcb,
+  gzip,
+  libXcursor,
+  libXxf86vm,
+  libXi,
+  libXrandr,
+  libGL,
+  xclip,
+  wayland,
+  libxkbcommon,
+  # Darwin Frameworks
+  cf-private,
+  AppKit,
+  CoreFoundation,
+  CoreGraphics,
+  CoreServices,
+  CoreText,
+  Foundation,
+  OpenGL }:
+
+with rustPlatform;
+
+let
+  metadata = import ./metadata.nix;
+  rpathLibs = [
+    expat
+    freetype
+    fontconfig
+    libX11
+    libXcursor
+    libXxf86vm
+    libXrandr
+    libGL
+    libXi
+    libxcb
+  ] ++ lib.optionals stdenv.isLinux [
+    wayland
+    libxkbcommon
+  ];
+in buildRustPackage rec {
+  pname = "alacritty";
+  version = metadata.rev;
+
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = pname;
+    rev = "${version}";
+    sha256 = metadata.sha256;
+  };
+
+  cargoSha256 = "1kdzpiq2341kcfrb3vlzaf17qfkwp8imildqr13h9ls9nbm170nv";
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    makeWrapper
+    pkgconfig
+    ncurses
+    gzip
+  ];
+
+  buildInputs = rpathLibs
+    ++ lib.optionals stdenv.isDarwin [
+      AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL
+      # Needed for CFURLResourceIsReachable symbols.
+      cf-private
+    ];
+
+  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 = ''
+    runHook preInstall
+
+    install -D target/release/alacritty $out/bin/alacritty
+
+  '' + (if stdenv.isDarwin then ''
+    mkdir $out/Applications
+    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+  '' else ''
+    install -D extra/linux/alacritty.desktop -t $out/share/applications/
+    install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '') + ''
+
+    install -D extra/completions/_alacritty -t "$out/share/zsh/site-functions/"
+    install -D extra/completions/alacritty.bash -t "$out/etc/bash_completion.d/"
+    install -D extra/completions/alacritty.fish -t "$out/share/fish/vendor_completions.d/"
+
+    install -dm 755 "$out/share/man/man1"
+    gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
+
+    install -dm 755 "$terminfo/share/terminfo/a/"
+    tic -x -o "$terminfo/share/terminfo" extra/alacritty.info
+    mkdir -p $out/nix-support
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+
+    runHook postInstall
+  '';
+
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "GPU-accelerated terminal emulator";
+    homepage = https://github.com/jwilm/alacritty;
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ mic92 ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+  };
+}
diff --git a/pkgs/alacritty/metadata.nix b/pkgs/alacritty/metadata.nix
new file mode 100644
index 0000000..d287905
--- /dev/null
+++ b/pkgs/alacritty/metadata.nix
@@ -0,0 +1,5 @@
+{
+  rev = "3156517c70db3c127688ffec43a9bdd59d06dfab";
+  sha256 = "1vj69fpdycd1apgn6p5b0xkyq7f39pgb9ip8raadyd9p3lmipbw0";
+  revdate = "2019-06-03T15:18:45Z";
+}
diff --git a/pkgs/grim/metadata.nix b/pkgs/grim/metadata.nix
index 62251e5..1988aec 100644
--- a/pkgs/grim/metadata.nix
+++ b/pkgs/grim/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "6994df611f55a4089209fdd5ad8d9301e4fb0167";
-  sha256 = "1r7ryrv9w3g26p0zik7xg5db0bs6ibx12mjg1xs03wjld3cfcyal";
-  revdate = "2019-02-20T13:18:55Z";
+  rev = "8b7b9d984535ce16e88cfb165269cab9a13bba3b";
+  sha256 = "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn";
+  revdate = "2019-06-03T18:50:17Z";
 }
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 22390bc..5b92ae9 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "6d52d66b53facd734fea38c61fc7090110dcd46d";
-  sha256 = "12hiz5ylcy8ai4qh8i6rjl2y0hm2fcizqsdvysinsd8vhzzw9x8r";
-  revdate = "2019-05-17T23:12:23Z";
+  rev = "96e932d98da673fd8ff2dfb92b86db5a3ef71a27";
+  sha256 = "085diq6nndy1p120jh6pxxy47fzjfmn5f0ss4nq5jipyf52s6nxn";
+  revdate = "2019-05-29T16:40:36Z";
 }
diff --git a/pkgs/kanshi/default.nix b/pkgs/kanshi/default.nix
index 2ea4f06..989165b 100644
--- a/pkgs/kanshi/default.nix
+++ b/pkgs/kanshi/default.nix
@@ -1,21 +1,17 @@
-{
-  stdenv, fetchFromGitHub, rustPlatform
-, libudev, pkgconfig
+{ stdenv, fetchFromGitHub
+, meson, pkgconfig
+, ninja, scdoc, libudev
+, wayland, wayland-protocols
+, buildDocs ? true
 }:
 
 let
   metadata = import ./metadata.nix;
-  pname = "kanshi";
-  version = metadata.rev;
 in
-rustPlatform.buildRustPackage {
-  inherit pname version;
+stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libudev ];
-
-  cargoBuildFlags = [];
+  pname = "kanshi";
+  version = metadata.rev;
 
   src = fetchFromGitHub {
     owner = "emersion";
@@ -24,14 +20,22 @@ rustPlatform.buildRustPackage {
     sha256 = metadata.sha256;
   };
 
-  cargoSha256Version = 2;
-  cargoSha256 = "0pvkrdjrg9y38vsrqkrvsknzp78sknpmq14rskvij450a9mpihii";
+  nativeBuildInputs = [ pkgconfig meson ninja ];
+
+  buildInputs = [
+    wayland wayland-protocols
+  ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = []
+    ++ stdenv.lib.optional (!buildDocs) "-Dman-pages=disabled";
 
   meta = with stdenv.lib; {
     description = "Dynamic display configuration";
     homepage = "https://github.com/emersion/kanshi";
     maintainers = with maintainers; [ colemickens ];
     platforms = platforms.linux;
-    #license = licenses.unknown; # TODO: ???
+    #license = TODO;
   };
 }
diff --git a/pkgs/kanshi/metadata.nix b/pkgs/kanshi/metadata.nix
index 96e6ca3..d4939b7 100644
--- a/pkgs/kanshi/metadata.nix
+++ b/pkgs/kanshi/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "970267e400c21a6bb51a1c80a0aadfd1e6660a7b";
-  sha256 = "10lfdan86bmwazpma6ixnv46z9cnf879gxln8gx87v7a1x3ss0bh";
-  revdate = "2019-02-02T23:21:00Z";
+  rev = "725d7881b39591a772b8b6cbaf8bb3eab4566b17";
+  sha256 = "09qmypm3yjvyv88hirvrq2sd50gv9af6dkla3xx8fb5ky1svqvl7";
+  revdate = "2019-06-03T04:55:45Z";
 }
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index f65ec1e..0638440 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ca8e763f06756136c534b1bbd2e5b536be6b1995";
-  sha256 = "1w16n58xj4ncaqjlwczq7i8kpxi05hjp2dqkqhajd9dzk0bd77qy";
-  revdate = "2019-05-24T15:52:38Z";
+  rev = "9064f6627b6488b1b6cb58b2c95ab65cbd823121";
+  sha256 = "0f5zw5l3669binc1hfdr9jm7hbwal9bc893xjlhkzjkqxk1n4lch";
+  revdate = "2019-06-02T16:26:55Z";
 }
diff --git a/pkgs/slurp/metadata.nix b/pkgs/slurp/metadata.nix
index 28b55b1..a779ba9 100644
--- a/pkgs/slurp/metadata.nix
+++ b/pkgs/slurp/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "92dc1ea1cf79541d157e98af3fb6aa4df501fef4";
-  sha256 = "112xgjs1v85msg4hpycqzi7cprmk4mr2l3lvx2jj3v6mp65pw9iz";
-  revdate = "2019-03-16T19:52:01Z";
+  rev = "0bd59daa7a3c701ec8f23bc5b4b77ea1df149a01";
+  sha256 = "16y4dy1x393mc1qghbs8if0b2q9kd439iw7n0l7shd6m9g51dm3c";
+  revdate = "2019-06-03T18:35:11Z";
 }
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index 85d5360..87205cc 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "e92ac7d5523d24132de59055b8c982b46ceae70a";
-  sha256 = "1m6k466r0q44bfyc2jvw085iq4kc2i9yzmv8ir98c3q97znmm2ak";
-  revdate = "2019-05-25T16:35:43Z";
+  rev = "6b6eb147ec2e79866f30a8f339c91f9bf5ca8c8c";
+  sha256 = "068x5p7m5q2vrgmsr5dhsssbzpjvwcwc4qci88c20344zqgf36v0";
+  revdate = "2019-06-03T12:50:12Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index ba2df26..fd2e644 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "6e69af89678a441c1145edc7210b545b1ea03ede";
-  sha256 = "06lbq5j7d5rwih44yw12chpbk84hwx50y67m36jlmcs28gw7i90x";
-  revdate = "2019-05-26T22:08:16Z";
+  rev = "9dbf057f58e4d5aa2ae7f1725e6d6f3af89dc744";
+  sha256 = "0z0q4z2bsa49rggzk5k28mliahj6cfla9ww45xrnh292yjihbzi0";
+  revdate = "2019-06-03T07:50:35Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 7a77d78..2637cfa 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "0ab1bb623e58bafef315c9eb33a430e72d40408a";
-  sha256 = "10ilqk4kjhfz293z4fivggzshs9i0b8jpy3kx75hjlkq6kis3y4b";
-  revdate = "2019-05-22T23:42:46Z";
+  rev = "3dec88e4555ee5fd95ffd69133623816cb0c25c4";
+  sha256 = "1hcbxvy3a47gy4c1lg8avql79ddchgv8px11w4s3d6dl6pzfc5km";
+  revdate = "2019-06-02T13:30:47Z";
 }