dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #15360: xscreensaver: Fix xscreensaver-text

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-17 09:13:59 +02:00
commit e429a4012e
3 changed files with 19 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";

11
pkgs/servers/x11/xorg/default.nix
View File

@ -28,6 +28,17 @@ let
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit ;}; }) // {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" { bdftopcf = (mkDerivation "bdftopcf" {
name = "bdftopcf-1.0.5"; name = "bdftopcf-1.0.5";
builder = ./builder.sh; builder = ./builder.sh;

1
pkgs/servers/x11/xorg/extra.list
View File

@ -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-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-wm-0.4.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
mirror://xorg/individual/app/appres-1.0.4.tar.bz2