diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-17 09:13:59 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-17 09:13:59 +0200 |
commit | e429a4012e908a8a553654cc456ebf213cb962ca (patch) | |
tree | e08446705fe12a5bc134d20f08f76857e071c309 /pkgs/misc/screensavers | |
parent | fde921578a8283578fa81cd66af7dbf34978a463 (diff) | |
parent | 288c355f0117dc931eb536e5298507f6a813fc7f (diff) | |
download | nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar.gz nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar.bz2 nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar.lz nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar.xz nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.tar.zst nixlib-e429a4012e908a8a553654cc456ebf213cb962ca.zip |
Merge #15360: xscreensaver: Fix `xscreensaver-text`
Diffstat (limited to 'pkgs/misc/screensavers')
-rw-r--r-- | pkgs/misc/screensavers/xscreensaver/default.nix | 9 |
1 files 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"; |