diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-03-26 20:14:20 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-03-26 20:14:20 +0300 |
| commit | f8c9810794269487da25988e256d89ca083f61d0 (patch) | |
| tree | 4e4597209f6c06fa9564eb72560dbbb8cc46b4fc /pkgs/misc/screensavers | |
| parent | c6c442bc064be45dae2332a2c6e1b483ec52bd7e (diff) | |
| parent | 47328e663c275151fdcef82e910fd3725c920df7 (diff) | |
| download | nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar.gz nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar.bz2 nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar.lz nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar.xz nixlib-f8c9810794269487da25988e256d89ca083f61d0.tar.zst nixlib-f8c9810794269487da25988e256d89ca083f61d0.zip | |
Merge pull request #6998 from oxij/update-rss-glx
rss-glx: update 0.8.1 -> 0.9.1, add meta, rename attribute in all-packages
Diffstat (limited to 'pkgs/misc/screensavers')
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 25 |
1 files changed, 18 insertions, 7 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; + }; } |