diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index 82d5bcc0b3af..ec8a4eaae917 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam
 , libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
 , libXxf86misc
-, libjpeg, mesa, gtk , libxml2, libglade}:
+, libjpeg, mesa, gtk, libxml2, libglade
+}:
 
 stdenv.mkDerivation rec {
   version = "5.12";
@@ -14,17 +15,15 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
-    libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
-    libXxf86misc ];
+      libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
+      libXxf86misc
+    ];
 
   configureFlags =
-    [
-      "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
-
+    [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
       "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
       "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
       "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
-
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
index 946cfc2b91e5..e8e82367cd79 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
 
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-2.22.1";
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
     sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
   };
-  
-  buildInputs = [ pkgconfig glib libtiff libjpeg libpng ];
+
+  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+  buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
   
   postInstall = "rm -rf $out/share/gtk-doc";