diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-05 18:55:30 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-05 18:55:30 +0100 |
commit | cb3d27df93d54dd913aa3348c996f4ed372d1c20 (patch) | |
tree | 602c0f0c643f88699117f5191b2c9a805d77a65b /pkgs/tools/X11 | |
parent | aff1f4ab948b921ceaf2b81610f2f82454302b4b (diff) | |
parent | 4e8853ca8d46988d283bc06a4c7cd6cf68a25576 (diff) | |
download | nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.gz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.bz2 nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.lz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.xz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.zst nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.zip |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/X11')
-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 7203229c47b5..e30badd0a85c 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 5c4456f6348d..2df037229ead 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"; |