diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-10 08:45:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-10 08:45:44 +0000 |
| commit | a8c55348491f65bb74e0b8d17c9dca7b7825cfa7 (patch) | |
| tree | ef3cd83ae94cc05fd4686a4a707f7ab8e94d7893 /pkgs/tools/X11/virtualgl | |
| parent | 134e9447583ce324b62baf8b697717b048458ec2 (diff) | |
| download | nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar.gz nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar.bz2 nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar.lz nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar.xz nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.tar.zst nixlib-a8c55348491f65bb74e0b8d17c9dca7b7825cfa7.zip | |
Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
Diffstat (limited to 'pkgs/tools/X11/virtualgl')
| -rw-r--r-- | pkgs/tools/X11/virtualgl/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/X11/virtualgl/xshm.patch | 13 |
2 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix new file mode 100644 index 000000000000..42d70251d5db --- /dev/null +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, mesa, libX11, openssl, libXext, libjpeg_turbo}: + +stdenv.mkDerivation { + name = "virtualgl-2.1.4"; + src = fetchurl { + url = mirror://sourceforge/virtualgl/VirtualGL-2.1.4.tar.gz; + sha256 = "d455e599620473a07711196615e59c73d08a7f392a9fcf60a6bc05d82809d89d"; + }; + + patches = [ ./xshm.patch ]; + + preInstall ='' + export makeFlags="prefix=$out" + ''; + + buildInputs = [ mesa libX11 openssl libXext libjpeg_turbo ]; + + meta = { + homepage = http://www.virtualgl.org/; + description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; + license = "free"; # many parts under different free licenses + }; +} diff --git a/pkgs/tools/X11/virtualgl/xshm.patch b/pkgs/tools/X11/virtualgl/xshm.patch new file mode 100644 index 000000000000..2ca81b559ea6 --- /dev/null +++ b/pkgs/tools/X11/virtualgl/xshm.patch @@ -0,0 +1,13 @@ +diff --git a/util/fbx.c b/util/fbx.c +index 06ea835..0d89842 100644 +--- a/util/fbx.c ++++ b/util/fbx.c +@@ -15,6 +15,8 @@ + // This library abstracts fast frame buffer access + #include <string.h> + #include <stdlib.h> ++#include <X11/Xmd.h> ++#include <X11/extensions/shmproto.h> + #include "fbx.h" + + #define MINWIDTH 160 |