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/antichamber.nix | 4 ++-- pkgs/games/humblebundle/brigador.nix | 4 ++-- pkgs/games/humblebundle/cavestoryplus.nix | 4 ++-- pkgs/games/humblebundle/dott.nix | 4 ++-- pkgs/games/humblebundle/ftl.nix | 4 ++-- pkgs/games/humblebundle/grim-fandango.nix | 4 ++-- pkgs/games/humblebundle/guacamelee.nix | 4 ++-- pkgs/games/humblebundle/hammerwatch.nix | 4 ++-- pkgs/games/humblebundle/spaz.nix | 2 +- pkgs/games/humblebundle/starbound.nix | 4 ++-- pkgs/games/humblebundle/swordsandsoldiers.nix | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/games/humblebundle') diff --git a/pkgs/games/humblebundle/antichamber.nix b/pkgs/games/humblebundle/antichamber.nix index c671c4ef..32e6ad2d 100644 --- a/pkgs/games/humblebundle/antichamber.nix +++ b/pkgs/games/humblebundle/antichamber.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchHumbleBundle, unzip -, xorg, libpulseaudio, libvorbis, libogg, mesa }: +, xorg, libpulseaudio, libvorbis, libogg, libGL }: stdenv.mkDerivation rec { name = "antichamber-1.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libpulseaudio libvorbis libogg - mesa + libGL ]; in '' dest="$out/share/antichamber" diff --git a/pkgs/games/humblebundle/brigador.nix b/pkgs/games/humblebundle/brigador.nix index 1e3be1cb..71fbea28 100644 --- a/pkgs/games/humblebundle/brigador.nix +++ b/pkgs/games/humblebundle/brigador.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, fetchHumbleBundle, writeText -, SDL2, mesa, glew, freeimage +, SDL2, libGL, glew, freeimage }: let @@ -64,7 +64,7 @@ in stdenv.mkDerivation { patchPhase = let fmodRpath = stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ]; - rpath = stdenv.lib.makeLibraryPath [ "$out" SDL2 mesa oldGLEW freeimage ]; + rpath = stdenv.lib.makeLibraryPath [ "$out" SDL2 libGL oldGLEW freeimage ]; in '' for fmod in lib/libfmod*.so*; do patchelf --set-rpath "${fmodRpath}" "$fmod" diff --git a/pkgs/games/humblebundle/cavestoryplus.nix b/pkgs/games/humblebundle/cavestoryplus.nix index d4c744d4..a549ebfb 100644 --- a/pkgs/games/humblebundle/cavestoryplus.nix +++ b/pkgs/games/humblebundle/cavestoryplus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, makeWrapper, SDL, mesa }: +{ stdenv, fetchHumbleBundle, makeWrapper, SDL, libGL }: stdenv.mkDerivation rec { name = "cave-story-plus-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL "$out" stdenv.cc.cc mesa + SDL "$out" stdenv.cc.cc libGL ]; in '' patchelf \ diff --git a/pkgs/games/humblebundle/dott.nix b/pkgs/games/humblebundle/dott.nix index 8f098d05..eef7fb87 100644 --- a/pkgs/games/humblebundle/dott.nix +++ b/pkgs/games/humblebundle/dott.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, mesa, libpulseaudio, alsaLib, libudev +{ stdenv, fetchHumbleBundle, libGL, libpulseaudio, alsaLib, libudev , writeText }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; rpath = stdenv.lib.makeLibraryPath [ - mesa stdenv.cc.cc libpulseaudio alsaLib.out libudev + libGL stdenv.cc.cc libpulseaudio alsaLib.out libudev ]; buildPhase = '' diff --git a/pkgs/games/humblebundle/ftl.nix b/pkgs/games/humblebundle/ftl.nix index 7423951a..5fd20a9f 100644 --- a/pkgs/games/humblebundle/ftl.nix +++ b/pkgs/games/humblebundle/ftl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, makeWrapper, SDL, mesa, libdevil, freetype }: +{ stdenv, fetchHumbleBundle, makeWrapper, SDL, libGL, libdevil, freetype }: stdenv.mkDerivation rec { name = "ftl-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL "$out" stdenv.cc.cc mesa libdevil freetype + SDL "$out" stdenv.cc.cc libGL libdevil freetype ]; in '' patchelf \ diff --git a/pkgs/games/humblebundle/grim-fandango.nix b/pkgs/games/humblebundle/grim-fandango.nix index c2b450e5..00c1a036 100644 --- a/pkgs/games/humblebundle/grim-fandango.nix +++ b/pkgs/games/humblebundle/grim-fandango.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, mesa, libpulseaudio, alsaLib, SDL2, writeText +{ stdenv, fetchHumbleBundle, libGL, libpulseaudio, alsaLib, SDL2, writeText , xorg }: @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; rpath = stdenv.lib.makeLibraryPath [ - mesa stdenv.cc.cc libpulseaudio alsaLib.out SDL2 xorg.libX11 + libGL stdenv.cc.cc libpulseaudio alsaLib.out SDL2 xorg.libX11 ]; buildPhase = '' 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 \ diff --git a/pkgs/games/humblebundle/hammerwatch.nix b/pkgs/games/humblebundle/hammerwatch.nix index 8cf65211..ab5bc29f 100644 --- a/pkgs/games/humblebundle/hammerwatch.nix +++ b/pkgs/games/humblebundle/hammerwatch.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHumbleBundle, makeWrapper, unzip, mono, SDL2, mesa, openal +{ stdenv, fetchHumbleBundle, makeWrapper, unzip, mono, SDL2, libGL, openal , pulseaudio }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip makeWrapper ]; installPhase = let - rpath = stdenv.lib.makeLibraryPath [ SDL2 mesa openal pulseaudio ]; + rpath = stdenv.lib.makeLibraryPath [ SDL2 libGL openal pulseaudio ]; monoNoLLVM = mono.override { withLLVM = false; }; in '' mkdir -p "$out/lib" diff --git a/pkgs/games/humblebundle/spaz.nix b/pkgs/games/humblebundle/spaz.nix index 5e40ea49..24d32e53 100644 --- a/pkgs/games/humblebundle/spaz.nix +++ b/pkgs/games/humblebundle/spaz.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = let libs = pkgsi686Linux.stdenv.lib.makeLibraryPath [ - pkgsi686Linux.mesa pkgsi686Linux.openal pkgsi686Linux.alsaPlugins + pkgsi686Linux.libGL pkgsi686Linux.openal pkgsi686Linux.alsaPlugins ]; in '' install -vD SPAZ "$out/libexec/spaz/spaz" diff --git a/pkgs/games/humblebundle/starbound.nix b/pkgs/games/humblebundle/starbound.nix index 2c63cb0d..baad485d 100644 --- a/pkgs/games/humblebundle/starbound.nix +++ b/pkgs/games/humblebundle/starbound.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchHumbleBundle, unzip, fetchurl, writeText, SDL2, mesa, xorg +{ stdenv, fetchHumbleBundle, unzip, fetchurl, writeText, SDL2, libGL, xorg , makeDesktopItem }: let binaryDeps = { starbound.deps = [ - SDL2 mesa xorg.libX11 xorg.libICE xorg.libSM xorg.libXext + SDL2 libGL xorg.libX11 xorg.libICE xorg.libSM xorg.libXext ]; starbound.needsBootconfig = true; diff --git a/pkgs/games/humblebundle/swordsandsoldiers.nix b/pkgs/games/humblebundle/swordsandsoldiers.nix index 2fd4fc4b..755f001c 100644 --- a/pkgs/games/humblebundle/swordsandsoldiers.nix +++ b/pkgs/games/humblebundle/swordsandsoldiers.nix @@ -1,5 +1,5 @@ { stdenv, fetchHumbleBundle, makeWrapper -, SDL, mesa, zlib, openal, libvorbis, xorg, fontconfig, freetype, libogg +, SDL, libGL, zlib, openal, libvorbis, xorg, fontconfig, freetype, libogg }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL mesa zlib openal libvorbis fontconfig freetype stdenv.cc.cc libogg + SDL libGL zlib openal libvorbis fontconfig freetype stdenv.cc.cc libogg xorg.libX11 xorg.libXft xorg.libXinerama xorg.libXext xorg.libXpm ]; in '' -- cgit 1.4.1