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

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 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, libGLU_combined, libX11 }:
, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }:
with stdenv.lib;
stdenv.mkDerivation rec{
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec{
sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88";
};
buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ];
buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ];
configureFlags = [
"--target=default"
pkgs/misc/emulators/attract-mode/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib
, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
];
meta = with stdenv.lib; {
pkgs/misc/emulators/dolphin-emu/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib
, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline
, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline
, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
, libpulseaudio ? null }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib
buildInputs = [ cmake bluez ffmpeg libao libGLU libGL 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,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
, miniupnpc, enet, mbedtls, soundtouch, sfml
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
++ lib.optional stdenv.isLinux wrapQtAppsHook;
buildInputs = [
curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
qtbase
pkgs/misc/emulators/dosbox/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, graphicsmagick }:
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }:
stdenv.mkDerivation rec {
name = "dosbox-0.74-3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ];
buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ];
nativeBuildInputs = [ graphicsmagick ];
pkgs/misc/emulators/emulationstation/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }:
stdenv.mkDerivation {
pname = "emulationstation";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ];
buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
buildPhase = "cmake . && make";
installPhase = ''
pkgs/misc/emulators/epsxe/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined,
{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
with stdenv.lib;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
glib
gtk3
libX11
libGLU_combined
libGLU libGL
openssl_1_0_2
ncurses5
SDL
pkgs/misc/emulators/fakenes/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11,
{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11,
libXxf86vm, libXcursor, libXpm }:
stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4";
};
buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11
buildInputs = [ allegro openal libGLU libGL 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, libGLU_combined, lua, freetype, libmpeg2, zip }:
, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, 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 libGLU_combined lua freetype libmpeg2 zip ];
buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL 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, libGLU_combined }:
{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }:
stdenv.mkDerivation {
name = "gens-gs-7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ];
buildInputs = [ gtk2 SDL nasm zlib libpng libGLU libGL ];
# 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
, libGLU_combined, SDL
, libGLU, libGL, SDL
, libao, openal, libpulseaudio
, gtk2, gtksourceview
, runtimeShell }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
buildInputs =
[ p7zip pkgconfig libX11 libXv udev libGLU_combined
[ p7zip pkgconfig libX11 libXv udev libGLU libGL
SDL libao openal libpulseaudio gtk2 gtksourceview ];
unpackPhase = ''
pkgs/misc/emulators/mednafen/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2
{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2
, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freeglut
libGLU_combined
libGLU libGL
libcdio
libjack2
libsamplerate
pkgs/misc/emulators/nestopia/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils
, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
epoxy
gtk3
gdk-pixbuf
libGLU_combined
libGLU libGL
libarchive
libao
unzip
pkgs/misc/emulators/retroarch/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg, libGLU_combined, freetype, libxml2, python3
, ffmpeg, libGLU, libGL, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libpulseaudio ? null
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]
++ optional withVulkan [ makeWrapper ];
buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python3 SDL2 which ]
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 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
@@ -4,7 +4,7 @@
, fetchFromGitHub
, ffmpeg
, gettext
, libGLU_combined
, libGLU, libGL
, openal
, pkgconfig
, SDL2
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cairo
ffmpeg
gettext
libGLU_combined
libGLU libGL
openal
SDL2
sfml
pkgs/misc/emulators/vice/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw
{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw
, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
};
buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined
buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL
pkgconfig gtk2 SDL autoreconfHook libXaw ];
dontDisableStatic = true;
configureFlags = [ "--enable-fullscreen --enable-gnomeui" ];
pkgs/misc/emulators/wine/base.nix
+1 -1
View File
@@ -58,7 +58,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ 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.libGLU_combined pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals openglSupport [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
pkgs/misc/emulators/wxmupen64plus/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined
{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
, wafHook }:
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ wafHook ];
buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ];
buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ];
preConfigure = ''
tar xf ${mupen64plus.src}
pkgs/misc/emulators/yabause/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ];
buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ];
patches = [
./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, libGLU_combined
{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL
, makeDesktopItem }:
let
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v";
};
buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ];
buildInputs = [ nasm SDL zlib libpng ncurses libGLU libGL ];
prePatch = ''
for i in $(cat debian/patches/series); do