diff --git a/.envrc b/.envrc
index 1a8c3a7408e..71c3f07646e 100644
--- a/.envrc
+++ b/.envrc
@@ -1,5 +1,12 @@
-watch_file nix/* flake.nix
-{
-    mkdir -p "$(direnv_layout_dir)"
-    eval "$(nix print-dev-env --no-update-lock-file --no-write-lock-file --profile $(direnv_layout_dir)/flake-profile)"
-} || use nix
+export GUILE_LOAD_PATH="$HOME/src/guix-channel/:$GUILE_LOAD_PATH"
+use guix
+
+export RUST_SRC_PATH="$HOME/src/rust/library"
+
+export LD_LIBRARY_PATH=$LIBRARY_PATH
+rm /tmp/cc
+ln -s $(guix build clang)/bin/clang /tmp/cc
+export PATH=$PATH:/tmp
+export LIBCLANG_PATH=$(guix build clang)/lib
+unset EMACSLOADPATH
+unset EMACSNATIVELOADPATH
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d91beefbc24..c903ba423ef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -78,7 +78,7 @@ jobs:
           bin_version=$version
           echo "version=$version" >> $GITHUB_ENV
           echo "bin_version=$bin_version" >> $GITHUB_ENV
-          ./build_emacs_ng.sh $bin_version
+          ./admin/build_emacs_ng.sh $bin_version
       - name: Build project with webrender
         if: ${{ matrix.build == 'webrender' }}
         run: |
@@ -86,7 +86,14 @@ jobs:
           bin_version=$version.webrender
           echo "version=$version" >> $GITHUB_ENV
           echo "bin_version=$bin_version" >> $GITHUB_ENV
-          ./build_emacs_ng.sh $bin_version --with-webrender --with-winit
+          ./admin/build_emacs_ng.sh $bin_version --with-webrender --with-winit
+      - name: Vendor Cargo sources
+        run: |
+          version=${{ needs.prepare_env.outputs.version }}
+          bin_version=$version.webrender
+          echo "version=$version" >> $GITHUB_ENV
+          echo "bin_version=$bin_version" >> $GITHUB_ENV
+          ./admin/vendor_cargo_source.sh $bin_version
       - name: Reduce cache
         continue-on-error: true
         run: |
diff --git a/build_emacs_ng.sh b/admin/build_emacs_ng.sh
similarity index 100%
rename from build_emacs_ng.sh
rename to admin/build_emacs_ng.sh
diff --git a/admin/vendor_cargo_source.sh b/admin/vendor_cargo_source.sh
new file mode 100755
index 00000000000..9be404f6b86
--- /dev/null
+++ b/admin/vendor_cargo_source.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [[ -z $@ ]]; then
+    echo "Usage: ./vendor_cargo_source.sh <emacs_version>"
+fi
+
+mkdir -p .cargo
+cargo vendor ./third_party/rust --respect-source-config > \
+      .cargo/config.toml
+git add -f ./third_party/rust
+git add .cargo/config.toml
+git commit --no-verify -m "Vendor Cargo Source"
+
+prefix=emacs-ng_$1
+
+git config tar.tar.xz.command "xz -c"
+git archive --prefix=$prefix/ HEAD -o $prefix.tar.xz