a6d234e9e9
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422 - rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance - add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility - update the attribute name where icedtea_web is used
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
Subject: [PATCH] make cargo work with nix-build on linux
|
|
|
|
---
|
|
.cargo/config | 2 ++
|
|
rust-launcher/Cargo.lock | 4 ++++
|
|
rust-launcher/Cargo.toml | 7 ++++---
|
|
3 files changed, 10 insertions(+), 3 deletions(-)
|
|
create mode 100644 .cargo/config
|
|
create mode 100644 rust-launcher/Cargo.lock
|
|
|
|
diff --git a/.cargo/config b/.cargo/config
|
|
new file mode 100644
|
|
index 0000000..03ec4a2
|
|
--- /dev/null
|
|
+++ b/.cargo/config
|
|
@@ -0,0 +1,2 @@
|
|
+[net]
|
|
+offline=true
|
|
diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock
|
|
new file mode 100644
|
|
index 0000000..6055cc0
|
|
--- /dev/null
|
|
+++ b/rust-launcher/Cargo.lock
|
|
@@ -0,0 +1,4 @@
|
|
+[[package]]
|
|
+name = "launcher"
|
|
+version = "1.8.0"
|
|
+
|
|
diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml
|
|
index 61ee308..5e6e91b 100644
|
|
--- a/rust-launcher/Cargo.toml
|
|
+++ b/rust-launcher/Cargo.toml
|
|
@@ -3,6 +3,7 @@ name = "launcher"
|
|
version = "1.8.0"
|
|
authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"]
|
|
|
|
-[dependencies]
|
|
-[target.'cfg(windows)'.dependencies]
|
|
-dunce = "0.1.1"
|
|
+[workspace]
|
|
+# We need this too or cargo will fail. Some files seem to be copied around and
|
|
+# cargo thinks we are in a workspace, so let's exclude everything.
|
|
+exclude = ["*"]
|
|
--
|
|
2.19.2
|
|
|