diff --git a/emacs.nix b/emacs.nix
index be97f5a..7c615c3 100644
--- a/emacs.nix
+++ b/emacs.nix
@@ -12,6 +12,9 @@
 , gnutls
 , jansson
 , gmp
+, xlibsWrapper, libXaw, libXpm
+, Xaw3d, libXcursor, pkg-config, libXft, dbus, libpng, libjpeg, giflib, giflib_4_1
+, libtiff, librsvg, imagemagick, libselinux
 , autoconf ? null
 , automake ? null
 , texinfo ? null
@@ -19,6 +22,7 @@
 , patches ? [ ]
 , srcRepo ? false
 , needCrtDir ? false
+, needLibGif4 ? false
 }:
 
 let
@@ -42,7 +46,8 @@ stdenv.mkDerivation rec {
     ++ lib.optionals srcRepo [ autoconf automake texinfo ];
 
   buildInputs =
-    [ ncurses libxml2 gnutls gettext jansson gmp ];
+    [ ncurses libxml2 gnutls gettext jansson gmp xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libtiff libXft librsvg imagemagick ]
+    ++ (if needLibGif4 then [ giflib_4_1 ] else [ giflib ]);
 
   hardeningDisable = [ "format" ];
 
@@ -51,14 +56,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-build-details" # for a (more) reproducible build
     "--with-modules"
-    "--with-x=no"
-    "--with-ns=no"
-    "--with-xpm=no"
-    "--with-jpeg=no"
-    "--with-png=no"
-    "--with-gif=no"
-    "--with-tiff=no"
-  ] ++ lib.optionals needCrtDir [ "--with-crt-dir=${stdenv.glibc}/lib" ];
+  ]
+  ++ lib.optionals needCrtDir [ "--with-crt-dir=${stdenv.glibc}/lib" ];
 
   postPatch = lib.concatStringsSep "\n" [
     (lib.optionalString srcRepo ''
diff --git a/overlay.nix b/overlay.nix
index e9c40be..37d975f 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -40,6 +40,7 @@ let
         ./patches/fpending-23.4.patch
       ];
       needCrtDir = true;
+      needLibGif4 = true;
     };
 
     emacs-24-1 = with super; callPackage ./emacs.nix {