alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xscreensaver: Fix xscreensaver-text helper

Browse source 
xscreensaver-text invokes `appres` binary at runtime. When it's missing,
some screensavers will display Perl stacktraces.
This commit is contained in:
Alexey Lebedeff 2016-05-09 08:12:46 +03:00
parent 02ce05d1cc
commit 288c355f01
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/misc/screensavers/xscreensaver/default.nix
View file

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