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

Merge #34461: mesa -> libGL* rename

Browse Source 
This will just bit rot otherwise.  Almost nothing gets rebuilt.
This commit is contained in:
Vladimír Čunát
2018-03-05 14:59:40 +01:00
parent 9b7d93edc9 04c31a5de1
commit 71f899c2c3
361 changed files with 830 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/atari800/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, unzip, zlib, SDL, readline, mesa, libX11 }:
, unzip, zlib, SDL, readline, libGLU_combined, libX11 }:
with stdenv.lib;
stdenv.mkDerivation rec{
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh";
};
buildInputs = [ unzip zlib SDL readline mesa libX11 ];
buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ];
configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice";
pkgs/misc/emulators/attract-mode/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
, mesa, openal, pkgconfig, sfml, stdenv, zlib
, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib
];
meta = with stdenv.lib; {
pkgs/misc/emulators/desmume/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, agg, alsaLib, soundtouch, openal
, desktop-file-utils
, gtk2, gtkglext, libglade, pangox_compat
, mesa_glu, libpcap, SDL, zziplib }:
, libGLU, libpcap, SDL, zziplib }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
openal desktop-file-utils gtk2 gtkglext libglade pangox_compat
mesa_glu libpcap SDL zziplib ];
libGLU libpcap SDL zziplib ];
configureFlags = [
"--disable-glade" # Failing on compile step
pkgs/misc/emulators/dolphin-emu/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, mesa
{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined
, gettext, libpthreadstubs, libXrandr, libXext, readline, openal
, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib
buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib
gettext libpthreadstubs libXrandr libXext readline openal
libevdev libXdmcp portaudio libusb libpulseaudio
libevdev libXdmcp portaudio libusb libpulseaudio
pkgs/misc/emulators/dolphin-emu/master.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib
, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
, openal, libXdmcp, portaudio, libusb, libevdev
, libpulseaudio ? null
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre
buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre
gettext libpthreadstubs libXrandr libXext libSM readline openal
libXdmcp portaudio libusb libpulseaudio libpng hidapi
] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
pkgs/misc/emulators/dosbox/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }:
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }:
stdenv.mkDerivation rec {
name = "dosbox-0.74";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ SDL mesa ];
buildInputs = [ SDL libGLU_combined ];
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
pkgs/misc/emulators/dosbox/unstable.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
let revision = "4025";
revisionDate = "2017-07-02";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ SDL SDL_net SDL_sound libpng mesa ];
buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ];
desktopItem = makeDesktopItem {
name = "dosbox";
pkgs/misc/emulators/emulationstation/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }:
, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
stdenv.mkDerivation rec {
name = "emulationstation-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ];
buildPhase = "cmake . && make";
installPhase = ''
pkgs/misc/emulators/fakenes/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11,
{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11,
libXxf86vm, libXcursor, libXpm }:
stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
};
buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11
buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11
libXxf86vm libXcursor libXpm ];
hardeningDisable = [ "format" ];
pkgs/misc/emulators/fs-uae/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }:
, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ];
meta = {
description = "An accurate, customizable Amiga Emulator";
pkgs/misc/emulators/gens-gs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }:
{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }:
stdenv.mkDerivation {
name = "gens-gs-7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 SDL nasm zlib libpng mesa ];
buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ];
# Work around build failures on recent GTK+.
# See http://ubuntuforums.org/showthread.php?p=10535837
pkgs/misc/emulators/higan/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, p7zip, pkgconfig
, libX11, libXv
, udev
, mesa, SDL
, libGLU_combined, SDL
, libao, openal, libpulseaudio
, gtk2, gtksourceview }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
buildInputs =
[ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ];
[ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ];
unpackPhase = ''
7z x $src
pkgs/misc/emulators/mednafen/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2
{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2
, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freeglut
mesa
libGLU_combined
libcdio
libjack2
libsamplerate
pkgs/misc/emulators/mess/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa
{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, libGLU_combined
, expat, zlib }:
let
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1";
buildInputs =
[ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ];
[ unzip pkgconfig SDL gtk2 GConf libGLU_combined expat zlib ];
installPhase =
''
pkgs/misc/emulators/nestopia/default.nix
+3 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu
, makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3
, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas
, epoxy, gdk_pixbuf, gnome3, wrapGAppsHook
}:
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
epoxy
gtk3
gdk_pixbuf
mesa_glu
mesa
libGLU_combined
libarchive
libao
unzip
pkgs/misc/emulators/openmsx/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig
, python
, alsaLib, glew, mesa_noglu, libpng
, alsaLib, glew, libGL, libpng
, libogg, libtheora, libvorbis
, SDL, SDL_image, SDL_ttf
, freetype, tcl, zlib
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python ];
buildInputs = [ alsaLib glew mesa_noglu libpng
buildInputs = [ alsaLib glew libGL libpng
libogg libtheora libvorbis freetype
SDL SDL_image SDL_ttf tcl zlib ];
pkgs/misc/emulators/retroarch/cores.nix
+8 -8
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch
, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL
, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis
, miniupnpc, sfml, xorg, zlib }:
@@ -147,7 +147,7 @@ in with stdenv.lib.licenses;
license = gpl2Plus;
extraBuildInputs = [
cmake curl mesa pcre pkgconfig sfml miniupnpc
cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
gettext glib gtk2 hidapi
libevdev libudev
] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
@@ -240,7 +240,7 @@ in with stdenv.lib.licenses;
description = "Port of MAME to libretro";
license = gpl2Plus;
extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ];
extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ];
}).override {
postPatch = ''
# Prevent the failure during the parallel building of:
@@ -270,7 +270,7 @@ in with stdenv.lib.licenses;
description = "Libretro port of Mupen64 Plus, GL only";
license = gpl2;
extraBuildInputs = [ mesa libpng ];
extraBuildInputs = [ libGLU_combined libpng ];
}).override {
buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
};
@@ -298,7 +298,7 @@ in with stdenv.lib.licenses;
description = "Parallel Mupen64plus rewrite for libretro.";
license = gpl2;
extraBuildInputs = [ mesa libpng ];
extraBuildInputs = [ libGLU_combined libpng ];
}).override {
buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
};
@@ -328,7 +328,7 @@ in with stdenv.lib.licenses;
};
description = "ppsspp libretro port";
license = gpl2;
extraBuildInputs = [ mesa ffmpeg ];
extraBuildInputs = [ libGLU_combined ffmpeg ];
}).override {
buildPhase = "cd libretro && make";
};
@@ -368,7 +368,7 @@ in with stdenv.lib.licenses;
};
description = "Reicast libretro port";
license = gpl2;
extraBuildInputs = [ mesa ];
extraBuildInputs = [ libGLU_combined ];
}).override {
buildPhase = "make";
};
@@ -382,7 +382,7 @@ in with stdenv.lib.licenses;
};
description = "Libretro port of ScummVM";
license = gpl2;
extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ];
}).override {
buildPhase = "cd backends/platform/libretro/build && make";
};
pkgs/misc/emulators/retroarch/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg, mesa, freetype, libxml2, python34
, ffmpeg, libGLU_combined, freetype, libxml2, python34
, libobjc, AppKit, Foundation
, alsaLib ? null
, libpulseaudio ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]
++ optional withVulkan [ makeWrapper ];
buildInputs = [ ffmpeg freetype libxml2 mesa python34 SDL2 which ]
buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python34 SDL2 which ]
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan [ vulkan-loader ]
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
pkgs/misc/emulators/vbam/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, libpthreadstubs
, libXdmcp
, libxshmfence
, mesa
, libGLU_combined
, openal
, pkgconfig
, SDL2
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
ffmpeg
gettext
gtk2-x11
mesa
libGLU_combined
openal
pkgconfig
SDL2
pkgs/misc/emulators/vice/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw
{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw
, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
};
buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa
buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined
pkgconfig gtk2 SDL autoreconfHook libXaw ];
dontDisableStatic = true;
configureFlags = "--enable-fullscreen --enable-gnomeui";
pkgs/misc/emulators/wine/base.nix
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ]
++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ]
++ (with pkgs.xorg; [
libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
])));
pkgs/misc/emulators/wxmupen64plus/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}:
{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}:
stdenv.mkDerivation {
name = "wxmupen64plus-0.3";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
};
buildInputs = [ python wxGTK29 SDL libX11 mesa ];
buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ];
configurePhase = ''
tar xf ${mupen64plus.src}
pkgs/misc/emulators/yabause/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qtbase mesa freeglut openal SDL2 ];
buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
pkgs/misc/emulators/zsnes/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa
{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined
, makeDesktopItem }:
let
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v";
};
buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ];
prePatch = ''
for i in $(cat debian/patches/series); do