diff --git a/Cargo.lock b/Cargo.lock
index 574da92f88e7db3c3553940fb9ea5aac907bbef5..79c3d6e6d09c0bb5f7315eef21e7cc30f67d744b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5466,7 +5466,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "subxt"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "async-trait",
  "derive-where",
@@ -5501,7 +5501,7 @@ dependencies = [
 [[package]]
 name = "subxt-codegen"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "frame-metadata 16.0.0",
  "heck 0.5.0",
@@ -5521,7 +5521,7 @@ dependencies = [
 [[package]]
 name = "subxt-core"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "base58",
  "blake2",
@@ -5549,7 +5549,7 @@ dependencies = [
 [[package]]
 name = "subxt-lightclient"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "futures",
  "futures-util",
@@ -5565,7 +5565,7 @@ dependencies = [
 [[package]]
 name = "subxt-macro"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "darling 0.20.10",
  "parity-scale-codec",
@@ -5579,7 +5579,7 @@ dependencies = [
 [[package]]
 name = "subxt-metadata"
 version = "0.37.0"
-source = "git+https://github.com/duniter/subxt?branch=subxt-v0.37.0-duniter-substrate-v1.14.0#00f181c1a5d8986e7146ddc72a745c793a9a1d8e"
+source = "git+https://github.com/immae/subxt?branch=no-rename#ef2ff00f866a1557d824ddee501ad0254e37a567"
 dependencies = [
  "frame-metadata 16.0.0",
  "hashbrown 0.14.5",
diff --git a/Cargo.toml b/Cargo.toml
index 9487a8e381151ec5af4ead643ab05f5c37244132..a1fde22d48d9129b842944fd067668e8affd217d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ version = "0.3.0"
 
 [dependencies]
 # subxt is main dependency
-subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.37.0-duniter-substrate-v1.14.0', default-features = false, features = [
+subxt = { git = 'https://github.com/immae/subxt', branch = 'no-rename', default-features = false, features = [
     "substrate-compat",
     "native",
     "jsonrpsee",
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..22da660c829b03768d9931d5df773e273485d9dd
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,8 @@
+{ pkgs ? import <nixpkgs> {} }: with pkgs;
+rustPlatform.buildRustPackage {
+  pname = "gcli";
+  version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
+  src = lib.cleanSource ./.;
+  cargoHash = "sha256-RTlCWeFMJw1LFLhTYofwLHlpFGmV168DAloiqbkeBig=";
+  useFetchCargoVendor = true;
+}