diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index f80796402449..19fdf5ce68e2 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -16,6 +16,7 @@
 , libxml2
 , dbus
 , gdk-pixbuf
+, harfbuzz
 , makeWrapper
 , which
 , xvfb_run
@@ -25,7 +26,7 @@
 let
   testDeps = [
     gobject-introspection # for Gio and cairo typelibs
-    gtk3 atk pango.out gdk-pixbuf
+    gtk3 atk pango.out gdk-pixbuf harfbuzz
   ];
 in stdenv.mkDerivation rec {
   pname = "gjs";
@@ -36,6 +37,20 @@ in stdenv.mkDerivation rec {
     sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph";
   };
 
+  patches = [
+    # Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3961.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/58337929c338e7b5c0a35196d783d3b2be542900.patch";
+      sha256 = "QgmU+d838fU5LiS4lhTF+179U1lY1L5tJbYtX/oc68k=";
+    })
+
+    # Hard-code various paths
+    ./fix-paths.patch
+
+    # Allow installing installed tests to a separate output.
+    ./installed-tests-path.patch
+  ];
+
   outputs = [ "out" "dev" "installedTests" ];
 
   nativeBuildInputs = [
@@ -68,14 +83,6 @@ in stdenv.mkDerivation rec {
     "-Dinstalled_test_prefix=${placeholder "installedTests"}"
   ];
 
-  patches = [
-    # Hard-code various paths
-    ./fix-paths.patch
-
-    # Allow installing installed tests to a separate output.
-    ./installed-tests-path.patch
-  ];
-
   doCheck = true;
 
   postPatch = ''