diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/alacritty/default.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/misc/curaengine/default.nix | 10 |
2 files changed, 19 insertions, 13 deletions
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 4544ed1fba3b..8be3db97c2b0 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, @@ -50,19 +50,17 @@ let OpenGL ]; 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; + name = "alacritty-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "v${version}"; + sha256 = "11z7diji64x6n3m5m2d0a9215aajg7mpklflvpwrglmghnvi74y6"; }; - cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx"; + cargoSha256 = "0ms0248bb2lgbzcqks6i0qhn1gaiim3jf1kl17qw52c8an3rc652"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ba9a98c616b3..75d1936ba857 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libarcus, stb }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }: stdenv.mkDerivation rec { name = "curaengine-${version}"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4"; }; + patches = [ + # Fixed upstream, but not yet released + (fetchpatch { + url = "https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch"; + sha256 = "1hxbslzhkvdg8p33mvlbrpw62gwfqpsdbfca6yhdng9hifl86j3f"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libarcus stb ]; |