From 02ce05d1cc88db79e082527d59653cd95691a136 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Sun, 8 May 2016 13:50:28 +0300
Subject: [PATCH 1/2] appres: init at 1.0.4

---
 pkgs/servers/x11/xorg/default.nix | 11 +++++++++++
 pkgs/servers/x11/xorg/extra.list  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7ba97cf35b0..45c01d74cdb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -28,6 +28,17 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
+  appres = (mkDerivation "appres" {
+    name = "appres-1.0.4";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2;
+      sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz";
+    };
+    buildInputs = [pkgconfig libX11 xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit libX11 xproto libXt ;};
+
   bdftopcf = (mkDerivation "bdftopcf" {
     name = "bdftopcf-1.0.5";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 80b5e14d8c3..fc3068b8f35 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -8,3 +8,4 @@ http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
+mirror://xorg/individual/app/appres-1.0.4.tar.bz2

From 288c355f0117dc931eb536e5298507f6a813fc7f Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Mon, 9 May 2016 08:12:46 +0300
Subject: [PATCH 2/2] xscreensaver: Fix xscreensaver-text helper

xscreensaver-text invokes `appres` binary at runtime. When it's missing,
some screensavers will display Perl stacktraces.
---
 pkgs/misc/screensavers/xscreensaver/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 34e6f0d45d6..ed218abd420 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
-, libxml2, libglade, intltool
+, libxml2, libglade, intltool, xorg, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
       libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
-      libXxf86misc intltool
+      libXxf86misc intltool xorg.appres makeWrapper
     ];
 
   preConfigure =
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
+  postInstall = ''
+      wrapProgram $out/bin/xscreensaver-text \
+        --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]}
+  '';
+
   meta = {
     homepage = "http://www.jwz.org/xscreensaver/";
     description = "A set of screensavers";