public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6998 from oxij/update-rss-glx

Browse Source 
rss-glx: update 0.8.1 -> 0.9.1, add meta, rename attribute in all-packages
This commit is contained in:
Arseniy Seroka 2015-03-26 20:14:20 +03:00
commit f8c9810794
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/misc/screensavers/rss-glx/default.nix
View File

@ -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 { src = fetchurl {
url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2";
sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg";
}; };
buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ];
NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; 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;
};
} }

4
pkgs/top-level/all-packages.nix
View File

@ -13738,7 +13738,7 @@ let
retroarch = retroarchBare; retroarch = retroarchBare;
}); });
rssglx = callPackage ../misc/screensavers/rss-glx { }; rss-glx = callPackage ../misc/screensavers/rss-glx { };
runit = callPackage ../tools/system/runit { }; runit = callPackage ../tools/system/runit { };
@ -14029,6 +14029,8 @@ let
nfsUtils = nfs-utils; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06
buildbotSlave = buildbot-slave; # added 2014-12-09 buildbotSlave = buildbot-slave; # added 2014-12-09
cool-old-term = cool-retro-term; # added 2015-01-31 cool-old-term = cool-retro-term; # added 2015-01-31
rssglx = rss-glx; #added 2015-03-25
opentsdb = callPackage ../tools/misc/opentsdb {}; opentsdb = callPackage ../tools/misc/opentsdb {};