xscreensaver: move hacks to default location, use stdenv, more deps

svn path=/nixpkgs/trunk/; revision=23161
This commit is contained in:
Yury G. Kudryashov 2010-08-13 14:06:23 +00:00
parent 2bf5f684c9
commit 5422f21700

View File

@ -1,41 +1,43 @@
x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
, libxml2, libglade, builderDefsPackage, ... }:
{ stdenv, fetchurl, pkgconfig, bc, perl, pam
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
, libXxf86misc
, libjpeg, mesa, gtk , libxml2, libglade}:
builderDefsPackage
(a: rec {
stdenv.mkDerivation rec {
version = "5.11";
name = "xscreensaver-${version}";
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
src = a.fetchurl {
inherit url;
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
};
buildInputs = with a;
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
xlibs.xlibs xlibs.libXmu
];
buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc ];
configureFlags =
[ "--with-gl"
"--with-dpms"
"--with-pixbuf"
[
"--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
"--with-hackdir=\${out}/share/xscreensaver-hacks"
];
preConfigure = a.fullDepEntry
preConfigure =
''
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in
'' ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
'';
meta = {
homepage = http://www.jwz.org/xscreensaver/;
description = "A set of screensavers";
maintainers = [ a.lib.maintainers.raskin ];
platforms = a.lib.platforms.allBut "i686-cygwin";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
};
}) x
}