diff --git a/shells/default.nix b/shells/default.nix
index fc902a64..80803574 100644
--- a/shells/default.nix
+++ b/shells/default.nix
@@ -8,7 +8,7 @@ with pkgs; {
   nix = callPackage ./nix.nix { };
   go = callPackage ./go.nix { };
   guile = callPackage ./guile.nix { };
-  guile3 = callPackage ./guile.nix { guile = guile_3_0; };
+  guile2 = callPackage ./guile.nix { guile = guile_2_2; };
   gtk3 = callPackage ./gtk.nix { gtk = gtk3; libportal-gtk = libportal-gtk3; };
   gtk4 = callPackage ./gtk.nix { gtk = gtk4; wrapGAppsHook = wrapGAppsHook4; libportal-gtk = libportal-gtk4; };
   hugo = callPackage ./hugo.nix { };
diff --git a/shells/guile.nix b/shells/guile.nix
index c57ad181..25ff5504 100644
--- a/shells/guile.nix
+++ b/shells/guile.nix
@@ -1,5 +1,9 @@
 { mkShell
 , lib
+, gcc
+, gettext
+, pkg-config
+, texinfo
 , guile
 , guile-hall
 }:
@@ -10,17 +14,12 @@ in
 mkShell {
   inherit guileVersion;
   packages = [
+    gettext
     guile
     guile-hall
+    pkg-config
+    texinfo
   ];
 
-  # This is already properly exported through setup hooks but to make
-  # intentions clearer.
-  shellHook = ''
-    export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH
-
-    if test $guileVersion == "3.0"; then
-      export GUILE_EXTENSIONS_PATH
-    fi
-  '';
+  inputsFrom = [ gcc guile ];
 }