diff options
Diffstat (limited to 'www/firefox/files/patch-bug1684261')
| -rw-r--r-- | www/firefox/files/patch-bug1684261 | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug1684261 b/www/firefox/files/patch-bug1684261 new file mode 100644 index 000000000000..954c0df10cf9 --- /dev/null +++ b/www/firefox/files/patch-bug1684261 @@ -0,0 +1,78 @@ + +# HG changeset patch +# User Emilio Cobos Álvarez <emilio@crisal.io> +# Date 1609006565 0 +# Node ID 48f46a7eada94d51d8bd508b5122642865ddef3d +# Parent f1bc2b9069ab9b6a246c10501782c0af267c77d7 +Bug 1684261 - Fix build with rust nightly. r=jrmuizel + +Fixes errors like: + + dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. + +I've left the most specific dependency, but for wgpu the rev is not +right, so I've kept the branch which effectively preserves behavior. + +Differential Revision: https://phabricator.services.mozilla.com/D100485 + +--- .cargo/config.in.orig 2021-02-12 15:09:04.023268000 +0100 ++++ .cargo/config.in 2021-02-12 15:09:20.428857000 +0100 +@@ -3,9 +3,9 @@ + # Please do not edit. + + [source."https://github.com/shravanrn/nix/"] +-branch = "r0.13.1" + git = "https://github.com/shravanrn/nix/" + replace-with = "vendored-sources" ++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" + + [source."https://github.com/mozilla/neqo"] + git = "https://github.com/mozilla/neqo" + +diff --git a/Cargo.lock b/Cargo.lock +--- Cargo.lock ++++ Cargo.lock +@@ -3447,17 +3447,17 @@ source = "registry+https://github.com/ru + checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4" + dependencies = [ + "unreachable", + ] + + [[package]] + name = "nix" + version = "0.13.1" +-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" ++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" + dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", + "void", + ] + +diff --git a/Cargo.toml b/Cargo.toml +--- Cargo.toml ++++ Cargo.toml +@@ -70,18 +70,18 @@ opt-level = 1 + [profile.release.build-override] + opt-level = 1 + + [patch.crates-io] + chardetng = { git = "https://github.com/hsivonen/chardetng", rev="7d5e0608d3e012bdfea3bd199111e3546607dd31" } + libudev-sys = { path = "dom/webauthn/libudev-sys" } + packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" } + rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" } +-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } +-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4", rev = "e9eff10f964957e7a001c5f712effe17ce09aa99" } ++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } ++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" } + # failure's backtrace feature might break our builds, see bug 1608157. + failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } + failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } + + [patch.crates-io.cranelift-codegen] + git = "https://github.com/mozilla-spidermonkey/wasmtime" + rev = "3334d92350da40b90d2529c147db3ea44918b558" + + |