summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-10-10 18:46:48 +0200
committerPeter Simons <simons@cryp.to>2012-10-10 18:46:48 +0200
commit6ff829f19df8b414960081a656e055bb9952c86f (patch)
tree70067a0ff11bd16b73c5c16aeb4257218a96d638 /pkgs/misc
parent7dd1e71c2e646cdc951df72f17607d0c98a8a79f (diff)
parentc35a43315c20708ce79f1e306160e8e90e4cbe75 (diff)
downloadnixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.gz
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.bz2
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.lz
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.xz
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.tar.zst
nixlib-6ff829f19df8b414960081a656e055bb9952c86f.zip
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/screensavers/xscreensaver/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index cf4f81ea4072..e3932744286c 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.18";
+  version = "5.19";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
+    sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
   };
 
   buildInputs =
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ''
       # Fix build error in version 5.18. Remove this patch when updating
       # to a later version.
-      sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
+      #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
       # Fix path to GTK.
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
 	  -i driver/Makefile.in po/Makefile.in.in