Skip to content

Commit 5dbebb2

Browse files
authored
aerogramme: fix build (#344205)
2 parents 8b86710 + 8b4ca80 commit 5dbebb2

File tree

3 files changed

+82
-9
lines changed

3 files changed

+82
-9
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From ad754664a05808bdbb976906a86ad0b08f16eb32 Mon Sep 17 00:00:00 2001
2+
From: wxt <[email protected]>
3+
Date: Tue, 24 Sep 2024 20:38:19 +0800
4+
Subject: [PATCH] update time-rs
5+
6+
---
7+
Cargo.lock | 16 ++++++++++++----
8+
1 file changed, 12 insertions(+), 4 deletions(-)
9+
10+
diff --git a/Cargo.lock b/Cargo.lock
11+
index 0a159ae..cf6b1c4 100644
12+
--- a/Cargo.lock
13+
+++ b/Cargo.lock
14+
@@ -2468,6 +2468,12 @@ dependencies = [
15+
"num-traits",
16+
]
17+
18+
+[[package]]
19+
+name = "num-conv"
20+
+version = "0.1.0"
21+
+source = "registry+https://github.com/rust-lang/crates.io-index"
22+
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
23+
+
24+
[[package]]
25+
name = "num-integer"
26+
version = "0.1.45"
27+
@@ -3579,12 +3585,13 @@ dependencies = [
28+
29+
[[package]]
30+
name = "time"
31+
-version = "0.3.31"
32+
+version = "0.3.36"
33+
source = "registry+https://github.com/rust-lang/crates.io-index"
34+
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
35+
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
36+
dependencies = [
37+
"deranged",
38+
"itoa",
39+
+ "num-conv",
40+
"powerfmt",
41+
"serde",
42+
"time-core",
43+
@@ -3599,10 +3606,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
44+
45+
[[package]]
46+
name = "time-macros"
47+
-version = "0.2.16"
48+
+version = "0.2.18"
49+
source = "registry+https://github.com/rust-lang/crates.io-index"
50+
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
51+
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
52+
dependencies = [
53+
+ "num-conv",
54+
"time-core",
55+
]
56+
57+
--
58+
2.46.0
59+

pkgs/by-name/ae/aerogramme/Cargo.lock

+12-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/by-name/ae/aerogramme/package.nix

+11-5
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@
66
openssl,
77
}:
88

9-
rustPlatform.buildRustPackage {
10-
RUSTC_BOOTSTRAP = true;
11-
9+
rustPlatform.buildRustPackage rec {
1210
pname = "aerogramme";
1311
version = "0.3.0";
1412

1513
src = fetchgit {
1614
url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/";
15+
rev = "refs/tags/${version}";
1716
hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y=";
1817
};
1918

19+
cargoPatches = [
20+
./0001-update-time-rs.patch
21+
];
22+
2023
# must use our own Cargo.lock due to git dependencies
2124
cargoLock = {
2225
lockFile = ./Cargo.lock;
@@ -31,8 +34,11 @@ rustPlatform.buildRustPackage {
3134
# disable network tests as Nix sandbox breaks them
3235
doCheck = false;
3336

34-
# get openssl-sys to use pkg-config
35-
OPENSSL_NO_VENDOR = 1;
37+
env = {
38+
# get openssl-sys to use pkg-config
39+
OPENSSL_NO_VENDOR = true;
40+
RUSTC_BOOTSTRAP = true;
41+
};
3642

3743
nativeBuildInputs = [ pkg-config ];
3844
buildInputs = [ openssl ];

0 commit comments

Comments
 (0)