Author: simons
Date: Fri Apr 6 19:30:30 2012
New Revision: 33655
URL: https://nixos.org/websvn/nix/?rev=33655&sc=1
Log:
xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers
hierarchy)
Added:
nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/
nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix
- copied, changed from r33653,
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix
Deleted:
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix (from r33653,
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix Fri Apr
6 18:56:05 2012 (r33653, copy source)
+++ nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix Fri Apr
6 19:30:30 2012 (r33655)
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "5.14";
+ version = "5.15";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";;
- sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy";
+ sha256 =
"4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d";
};
buildInputs =
@@ -27,14 +27,14 @@
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
];
- preConfigure =
+ preConfigure = ''
''
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in
'';
meta = {
- homepage = http://www.jwz.org/xscreensaver/;
+ homepage = "http://www.jwz.org/xscreensaver/";;
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Apr 6 19:21:50
2012 (r33654)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Apr 6 19:30:30
2012 (r33655)
@@ -4795,7 +4795,7 @@
perl = perl510;
};
- webkit_gtk2 =
+ webkit_gtk2 =
builderDefsPackage ../development/libraries/webkit/gtk2.nix {
inherit (gnome) gtkdoc libsoup;
inherit gtk atk pango glib;
@@ -7666,7 +7666,7 @@
pyrex = pyrex095;
};
- xscreensaver = callPackage ../applications/graphics/xscreensaver {
+ xscreensaver = callPackage ../misc/screensavers/xscreensaver {
inherit (gnome) libglade;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
