From 64f20381dc92ba36cef6cd677f4ea2bdb8c19288 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 7 Jul 2021 13:54:00 +0800 Subject: xcolor: fix build --- pkgs/tools/graphics/xcolor/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/graphics/xcolor') diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index f19a80357f359..1e8f3fd78d72f 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libX11, libXcursor, libxcb, python3 }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, libX11, libXcursor, libxcb, python3 }: rustPlatform.buildRustPackage rec { pname = "xcolor"; @@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rHqK05dN5lrvDNbRCWGghI7KJwWzNCuRDEThEeMzmio="; }; - cargoSha256 = "sha256-lHOT/P1Sh1b53EkPIQM3l9Tozdqh60qlUDdjthj32jM="; + cargoPatches = [ + # Update Cargo.lock, lexical_core doesn't build on Rust 1.52.1 + (fetchpatch { + url = "https://github.com/Soft/xcolor/commit/324d80a18a39a11f2f7141b226f492e2a862d2ce.patch"; + sha256 = "sha256-5VzXitpl/gMef40UQBh1EoHezXPyB08aflqp0mSMAVI="; + }) + ]; + + cargoSha256 = "sha256-yD4pX+dCJvbDecsdB8tNt1VsEcyAJxNrB5WsZUhPGII="; nativeBuildInputs = [ pkg-config python3 ]; -- cgit 1.4.1