diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-14 20:55:48 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-14 20:55:48 +0000 |
| commit | 7219a09001291ef236ad8ac02713096bec0d0c08 (patch) | |
| tree | f14a36e929e646e9977f3f4bbccd64b6d1516860 /pkgs/misc/screensavers | |
| parent | 80b2254cbb90bfb93dbe1bb5a58866db68e17ae4 (diff) | |
| download | nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.gz nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.bz2 nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.lz nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.xz nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.tar.zst nixlib-7219a09001291ef236ad8ac02713096bec0d0c08.zip | |
* ioquake: updated to 1.34rc3.
* rss-glx: fixed the build. * Removed the OpenGL wrapper stuff, it's no longer needed (thanks to the RUNPATH you just need to put the appropriate libGL.so in the LD_LIBRARY_PATH). svn path=/nixpkgs/trunk/; revision=12093
Diffstat (limited to 'pkgs/misc/screensavers')
| -rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 8e45bd8d0d4b..fb7cf569fdf5 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, x11, mesa}: +{stdenv, fetchurl, x11, mesa, pkgconfig, imagemagick, libtiff, bzip2}: stdenv.mkDerivation { name = "rss-glx-0.8.1"; - builder = ./builder.sh; + + #builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f"; }; - buildInputs = [x11 mesa]; - inherit mesa; - - mesaSwitch = ../../../build-support/opengl/mesa-switch.sh; + buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; + + NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; } |