public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49794 from avnik/fix/openarena

Browse Source 
openarena: fix loading libGL.so with libglvnd
This commit is contained in:
Jörg Thalheim 2018-11-14 17:49:55 +00:00 committed by GitHub
commit 80389f0046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/openarena/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis, curl }: { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openarena-${version}"; name = "openarena-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = let installPhase = let
gameDir = "$out/openarena-$version"; gameDir = "$out/openarena-$version";
interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis curl ]; libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl ];
in '' in ''
mkdir -pv $out/bin mkdir -pv $out/bin
cd $out cd $out