From 8066d9de0a18664336616e602bb06220a9553de4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 21 Apr 2018 03:05:36 +0200 Subject: pkgs/games: Replace usages of mesa with libGL This has been changed in NixOS/nixpkgs@6bf1421f13d667c2997b67728cf777c6, so let's change it here as well. Quote from the mentioned commit: Implement libGL as a symlink package which uses libraries from libglvnd and headers from Mesa (since ones from libglvnd are outdated). Signed-off-by: aszlig --- pkgs/games/humblebundle/guacamelee.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/games/humblebundle/guacamelee.nix') diff --git a/pkgs/games/humblebundle/guacamelee.nix b/pkgs/games/humblebundle/guacamelee.nix index 537ec945..5cc39837 100644 --- a/pkgs/games/humblebundle/guacamelee.nix +++ b/pkgs/games/humblebundle/guacamelee.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, unzip, SDL2, mesa, writeText, makeWrapper }: +{ stdenv, fetchHumbleBundle, unzip, SDL2, libGL, writeText, makeWrapper }: stdenv.mkDerivation rec { name = "guacamelee-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; buildPhase = let - rpath = stdenv.lib.makeLibraryPath [ SDL2 stdenv.cc.cc mesa ]; + rpath = stdenv.lib.makeLibraryPath [ SDL2 stdenv.cc.cc libGL ]; fmodRpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in '' gcc -Werror -shared "$preloader" -o preloader.so -ldl \ -- cgit 1.4.1