diff options
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index a41fe5afb9ee..48d88ed40ce6 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,14 +1,25 @@ -{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "rss-glx-${version}"; -stdenv.mkDerivation { - name = "rss-glx-0.8.1"; - src = fetchurl { - url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; - sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; + url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2"; + sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; + buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; + NIX_LDFLAGS= "-rpath ${libXext}/lib"; + + meta = { + description = "Really Slick Screensavers Port to GLX"; + longDescription = '' + This package currently contains all of the screensavers from the + original collection, plus a few others. + ''; + licence = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 359b4db1e583..4d26a8d9f2dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13738,7 +13738,7 @@ let retroarch = retroarchBare; }); - rssglx = callPackage ../misc/screensavers/rss-glx { }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; runit = callPackage ../tools/system/runit { }; @@ -14029,6 +14029,8 @@ let nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 cool-old-term = cool-retro-term; # added 2015-01-31 + rssglx = rss-glx; #added 2015-03-25 + opentsdb = callPackage ../tools/misc/opentsdb {}; |