alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

virtualgl: 2.4.1 -> 2.5

Browse source
This commit is contained in:
Nikolay Amiantov 2016-03-03 15:55:55 +03:00
parent 01a3b6c059
commit 2a7f56bc8f
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/tools/X11/virtualgl/default.nix
View file

@ -1,22 +1,19 @@
{ lib, buildEnv { stdenv, lib
, virtualglLib , virtualglLib
, virtualglLib_i686 ? null , virtualglLib_i686 ? null
}: }:
buildEnv { stdenv.mkDerivation {
name = "virtualgl-${lib.getVersion virtualglLib}"; name = "virtualgl-${lib.getVersion virtualglLib}";
paths = [ virtualglLib ]; paths = [ virtualglLib ];
postBuild = lib.optionalString (virtualglLib_i686 != null) '' buildCommand = ''
rm $out/fakelib mkdir -p $out/bin
# workaround for #4621 for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
rm $out/bin ln -s "$i" $out/bin
mkdir $out/bin
for i in ${virtualglLib}/bin/*; do
ln -s $i $out/bin
done done
ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin '' + lib.optionalString (virtualglLib_i686 != null) ''
ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
''; '';
} }

10
pkgs/tools/X11/virtualgl/lib.nix
View file

@ -1,14 +1,12 @@
{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: { stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }:
let stdenv.mkDerivation rec {
version = "2.4.1";
in
stdenv.mkDerivation {
name = "virtualgl-lib-${version}"; name = "virtualgl-lib-${version}";
version = "2.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298"; sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
}; };
cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ];
@ -19,6 +17,8 @@ stdenv.mkDerivation {
buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.virtualgl.org/; homepage = http://www.virtualgl.org/;
description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration";