xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy)

svn path=/nixpkgs/trunk/; revision=33655
This commit is contained in:
Peter Simons 2012-04-06 19:30:30 +00:00
parent 44b6ab6d32
commit 8beb891d52
2 changed files with 6 additions and 6 deletions

View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.14"; version = "5.15";
name = "xscreensaver-${version}"; name = "xscreensaver-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy"; sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d";
}; };
buildInputs = buildInputs =
@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
]; ];
preConfigure = preConfigure = ''
'' ''
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in -i driver/Makefile.in po/Makefile.in.in
''; '';
meta = { meta = {
homepage = http://www.jwz.org/xscreensaver/; homepage = "http://www.jwz.org/xscreensaver/";
description = "A set of screensavers"; description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin"; platforms = stdenv.lib.platforms.allBut "i686-cygwin";

View File

@ -4795,7 +4795,7 @@ let
perl = perl510; perl = perl510;
}; };
webkit_gtk2 = webkit_gtk2 =
builderDefsPackage ../development/libraries/webkit/gtk2.nix { builderDefsPackage ../development/libraries/webkit/gtk2.nix {
inherit (gnome) gtkdoc libsoup; inherit (gnome) gtkdoc libsoup;
inherit gtk atk pango glib; inherit gtk atk pango glib;
@ -7666,7 +7666,7 @@ let
pyrex = pyrex095; pyrex = pyrex095;
}; };
xscreensaver = callPackage ../applications/graphics/xscreensaver { xscreensaver = callPackage ../misc/screensavers/xscreensaver {
inherit (gnome) libglade; inherit (gnome) libglade;
}; };