diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-10-26 12:36:02 +0100 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-10-26 13:38:14 +0100 |
| commit | 4617be781789d396ad20560136dac8670ef9f7f2 (patch) | |
| tree | 447eb6a104f2a48a471a8a93b42fbcfc41e6dd0f /pkgs/applications/misc/alacritty/default.nix | |
| parent | 000b68c22606fc244456e09c92c83663614a96d9 (diff) | |
| download | nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar.gz nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar.bz2 nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar.lz nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar.xz nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.tar.zst nixpkgs-4617be781789d396ad20560136dac8670ef9f7f2.zip | |
alacritty: 2017-10-17 -> 2017-10-22, remove broken status
Diffstat (limited to 'pkgs/applications/misc/alacritty/default.nix')
| -rw-r--r-- | pkgs/applications/misc/alacritty/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 77466fba653..067cb675571 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,5 +1,5 @@ { stdenv, - fetchFromGitHub, + fetchgit, rustPlatform, cmake, makeWrapper, @@ -29,16 +29,19 @@ let in buildRustPackage rec { - name = "alacritty-unstable-2017-10-17"; + name = "alacritty-unstable-${version}"; + version = "2017-10-22"; - src = fetchFromGitHub { - owner = "jwilm"; - repo = "alacritty"; - rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6"; - sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx"; + # 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 = "02wvwi72hnqmy12n0b248wzhajni9ipyayz6vnn3ryhnrccrrp7j"; + fetchSubmodules = true; }; - cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz"; + cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i"; buildInputs = [ cmake @@ -54,14 +57,10 @@ buildRustPackage rec { installPhase = '' runHook preInstall - mkdir -p $out/bin - for f in $(find target/release -maxdepth 1 -type f); do - cp $f $out/bin - done; + install -D target/release/alacritty $out/bin/alacritty patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty - mkdir -p $out/share/applications - cp Alacritty.desktop $out/share/applications/alacritty.desktop + install -D Alacritty.desktop $out/share/applications/alacritty.desktop runHook postInstall ''; @@ -69,7 +68,6 @@ buildRustPackage rec { dontPatchELF = true; meta = with stdenv.lib; { - broken = true; description = "GPU-accelerated terminal emulator"; homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; |