diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-03 15:55:55 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-04 14:46:45 +0300 |
| commit | 2a7f56bc8fd19e30516e083b42a820e4cc9c3a87 (patch) | |
| tree | 57d16c5f405ed24242d5a296673962013973dd52 /pkgs/tools/X11/virtualgl | |
| parent | 01a3b6c0591ee3bf4966658d29d4c149a5f94d34 (diff) | |
| download | nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar.gz nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar.bz2 nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar.lz nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar.xz nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.tar.zst nixpkgs-2a7f56bc8fd19e30516e083b42a820e4cc9c3a87.zip | |
virtualgl: 2.4.1 -> 2.5
Diffstat (limited to 'pkgs/tools/X11/virtualgl')
| -rw-r--r-- | pkgs/tools/X11/virtualgl/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/X11/virtualgl/lib.nix | 10 |
2 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index 7203229c47b..e30badd0a85 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -1,22 +1,19 @@ -{ lib, buildEnv +{ stdenv, lib , virtualglLib , virtualglLib_i686 ? null }: -buildEnv { +stdenv.mkDerivation { name = "virtualgl-${lib.getVersion virtualglLib}"; paths = [ virtualglLib ]; - postBuild = lib.optionalString (virtualglLib_i686 != null) '' - rm $out/fakelib - # workaround for #4621 - rm $out/bin - mkdir $out/bin - for i in ${virtualglLib}/bin/*; do - ln -s $i $out/bin + buildCommand = '' + mkdir -p $out/bin + for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do + ln -s "$i" $out/bin done - ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin - ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin + '' + lib.optionalString (virtualglLib_i686 != null) '' + ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ''; } diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 5c4456f6348..2df037229ea 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: -let - version = "2.4.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298"; + sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; @@ -19,6 +17,8 @@ stdenv.mkDerivation { buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; |