From 4f8b98035500c02338488ccd0c7627c17697e8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Nov 2017 18:23:31 +0100 Subject: [PATCH] torcs: fix libGL when the OS uses non-mesa Fixes OP of issue #30749. --- pkgs/games/torcs/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1b6ad5b34c3..26f0fe534f3 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -29,18 +29,11 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; - nativeBuildInputs = [ bash ]; - installTargets = "install datainstall"; - postInstall = '' - wrapProgram $out/bin/torcs \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib - ''; - meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/;