summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-09-11 21:52:06 +0100
committerSymphorien Gibol <symphorien+git@xlumurb.eu>2018-09-11 23:44:14 +0200
commit33dab23255cedcf83fe1710a35b9b962f41406aa (patch)
tree474163567645c6253b2e31e0ed73018f3d3e0b84
parent7bfa20198afce7830ff2daccb4400f03c9f40e0c (diff)
downloadnixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar.gz
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar.bz2
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar.lz
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar.xz
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.tar.zst
nixpkgs-33dab23255cedcf83fe1710a35b9b962f41406aa.zip
alacritty: switch back to upstream source
Thanks to https://github.com/NixOS/nixpkgs/pull/46362
We can now support git dependencies!
-rw-r--r--pkgs/applications/misc/alacritty/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4544ed1fba3..98e93321265 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,6 +1,6 @@
 { stdenv,
   lib,
-  fetchgit,
+  fetchFromGitHub,
   rustPlatform,
   cmake,
   makeWrapper,
@@ -51,18 +51,16 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-08-30";
-
-  # At the moment we cannot handle git dependencies in buildRustPackage.
-  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
-  src = fetchgit {
-    url = https://github.com/Mic92/alacritty.git;
-    rev = "rev-${version}";
-    sha256 = "0izvg7dwwb763jc6gnmn47i5zrkxvmh3vssn6vzrrmqhd4j3msmf";
-    fetchSubmodules = true;
+  version = "2018-08-05";
+
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "alacritty";
+    rev = "1adb5cb7fc05054197aa08e0d1fa957df94888ab";
+    sha256 = "06rc7dy1vn59lc5hjh953h9lh0f39c0n0jmrz472mrya722fl2ab";
   };
 
-  cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx";
+  cargoSha256 = "0ms0248bb2lgbzcqks6i0qhn1gaiim3jf1kl17qw52c8an3rc652";
 
   nativeBuildInputs = [
     cmake