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] 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 34e6f0d45d69..ed218abd4207 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";