From 7eeb4f5f1788aaf6a362bb8fab40ceae08bcd957 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 15 May 2024 12:05:47 +0200 Subject: [PATCH] dtool: replace rustc-serialize version to unbreak build --- pkgs/tools/misc/dtool/default.nix | 4 +++- pkgs/tools/misc/dtool/rustc-serialize-fix.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/dtool/rustc-serialize-fix.patch diff --git a/pkgs/tools/misc/dtool/default.nix b/pkgs/tools/misc/dtool/default.nix index 9cf22a9da39f..8fdb2f533d47 100644 --- a/pkgs/tools/misc/dtool/default.nix +++ b/pkgs/tools/misc/dtool/default.nix @@ -16,11 +16,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4="; }; - cargoHash = "sha256-r8r3f4yKMQgjtB3j4qE7cqQL18nIqAGPO5RsFErqh2c="; + cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + # FIXME: remove patch when upstream version of rustc-serialize is updated + cargoPatches = [ ./rustc-serialize-fix.patch ]; checkType = "debug"; diff --git a/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/pkgs/tools/misc/dtool/rustc-serialize-fix.patch new file mode 100644 index 000000000000..8d0327e8a457 --- /dev/null +++ b/pkgs/tools/misc/dtool/rustc-serialize-fix.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b1cc23695b30..ffdeb1c90618 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -996,9 +996,9 @@ dependencies = [ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustix"