movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

treewide: replace freeglut with libglut

Browse source 
Allow the macOS GLUT framework to be used automatically in many
cases. Packages that specifically search for freeglut or require its
additional APIs should still explicitly depend on it.

Deliberately skip the Haskell package set, which is mostly
automatically generated, and mupdf, which has its own fork of freeglut.
This commit is contained in:
Emily 2024-06-20 05:39:23 +01:00
parent c884bc3260
commit fbda1dbfd6
74 changed files with 150 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/pd-plugins/gem/default.nix
View file

@ -7,7 +7,7 @@
, libGL , libGL
, libGLU , libGLU
, glew , glew
, freeglut , libglut
, libv4l , libv4l
, libX11 , libX11
, file , file
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libGL libGL
libGLU libGLU
glew glew
freeglut libglut
libv4l libv4l
libX11 libX11
]; ];

4
pkgs/applications/audio/sndpeek/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu { lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu
, libXext, libXi }: , libXext, libXi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./pthread.patch ]; patches = [ ./pthread.patch ];
buildInputs = [ buildInputs = [
freeglut libglut
alsa-lib alsa-lib
mesa mesa
libGLU libGLU

4
pkgs/applications/emulators/yabause/default.nix
View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL { mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
, freeglut ? null, openal ? null, SDL2 ? null }: , libglut ? null, openal ? null, SDL2 ? null }:
mkDerivation rec { mkDerivation rec {
pname = "yabause"; pname = "yabause";
@ -11,7 +11,7 @@ mkDerivation rec {
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ];
patches = [ patches = [
./linkage-rwx-linux-elf.patch ./linkage-rwx-linux-elf.patch

4
pkgs/applications/graphics/fluxus/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitLab , fetchFromGitLab
, alsa-lib , alsa-lib
, fftw , fftw
, freeglut , libglut
, freetype , freetype
, glew , glew
, libjack2 , libjack2
@ -33,7 +33,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
fftw fftw
freeglut.dev libglut.dev
freetype freetype
glew glew
libjack2 libjack2

4
pkgs/applications/graphics/freepv/default.nix
View file

@ -4,7 +4,7 @@
, libjpeg , libjpeg
, libGLU , libGLU
, libGL , libGL
, freeglut , libglut
, zlib , zlib
, cmake , cmake
, libX11 , libX11
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ];
postPatch = '' postPatch = ''
sed -i -e '/GECKO/d' CMakeLists.txt sed -i -e '/GECKO/d' CMakeLists.txt

4
pkgs/applications/graphics/opentoonz/default.nix
View file

@ -1,7 +1,7 @@
{ boost { boost
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, freeglut , libglut
, freetype , freetype
, glew , glew
, libjpeg , libjpeg
@ -93,7 +93,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
boost boost
freeglut libglut
freetype freetype
glew glew
libjpeg libjpeg

4
pkgs/applications/misc/icesl/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM { stdenv, lib, fetchzip, libglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM
, libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper , libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper
}: }:
let let
lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; lpath = lib.makeLibraryPath [ libXmu libXi libX11 libglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iceSL"; pname = "iceSL";

2
pkgs/applications/misc/lutris/fhsenv.nix
View file

@ -62,7 +62,7 @@ in buildFHSEnv {
fontconfig SDL2_ttf fontconfig SDL2_ttf
# Mednafen # Mednafen
freeglut mesa_glu libglut mesa_glu
# MESS # MESS
expat expat

6
pkgs/applications/misc/mupdf/1.17/default.nix
View file

@ -2,7 +2,7 @@
, jbig2dec, libjpeg , darwin , jbig2dec, libjpeg , darwin
, enableX11 ? true, libX11, libXext, libXi, libXrandr , enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl , enableCurl ? true, curl, openssl
, enableGL ? true, freeglut, libGLU , enableGL ? true, libglut, libGLU
}: }:
let let
@ -33,14 +33,14 @@ in stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ]
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableCurl [ curl openssl ]
++ lib.optionals enableGL ( ++ lib.optionals enableGL (
if stdenv.isDarwin then if stdenv.isDarwin then
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
else else
[ freeglut libGLU ]) [ libglut libGLU ])
; ;
outputs = [ "bin" "dev" "out" "man" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];

4
pkgs/applications/science/astronomy/celestia/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext { lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext
, libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ buildInputs = [
freeglut gtk2 gtkglext lua perl libglut gtk2 gtkglext lua perl
libjpeg_turbo libtheora libXmu libGLU libGL libjpeg_turbo libtheora libXmu libGLU libGL
]; ];

4
pkgs/applications/science/geometry/antiprism/default.nix
View file

@ -4,7 +4,7 @@
, libX11 , libX11
, libGL , libGL
, libGLU , libGLU
, freeglut }: , libglut }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "antiprism"; pname = "antiprism";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; buildInputs = [ libX11 libGLU libGL.dev libglut.dev ];
meta = with lib; { meta = with lib; {
homepage = "https://www.antiprism.com"; homepage = "https://www.antiprism.com";

4
pkgs/applications/science/math/glsurf/default.nix
View file

@ -5,7 +5,7 @@
, makeWrapper , makeWrapper
, libGLU , libGLU
, libGL , libGL
, freeglut , libglut
, mpfr , mpfr
, gmp , gmp
, pkgsHostTarget , pkgsHostTarget
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
]); ]);
buildInputs = [ buildInputs = [
freeglut libglut
libGL libGL
libGLU libGLU
mpfr mpfr

4
pkgs/applications/science/misc/boinc/default.nix
View file

@ -10,7 +10,7 @@
, libGL , libGL
, libXmu , libXmu
, libXi , libXi
, freeglut , libglut
, libjpeg , libjpeg
, libtool , libtool
, wxGTK32 , wxGTK32
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
libGL libGL
libXmu libXmu
libXi libXi
freeglut libglut
libjpeg libjpeg
wxGTK32 wxGTK32
gtk3 gtk3

4
pkgs/applications/science/misc/foldingathome/viewer.nix
View file

@ -2,7 +2,7 @@
, autoPatchelfHook , autoPatchelfHook
, dpkg , dpkg
, fetchurl , fetchurl
, freeglut , libglut
, gcc-unwrapped , gcc-unwrapped
, libGL , libGL
, libGLU , libGLU
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
freeglut libglut
gcc-unwrapped.lib gcc-unwrapped.lib
libGL libGL
libGLU libGLU

2
pkgs/build-support/appimage/default.nix
View file

@ -162,7 +162,7 @@ rec {
vulkan-loader vulkan-loader
flac flac
freeglut libglut
libjpeg libjpeg
libpng12 libpng12
libpulseaudio libpulseaudio

4
pkgs/by-name/ch/chow-kick/package.nix
View file

@ -6,7 +6,7 @@
, dbus , dbus
, libepoxy , libepoxy
, fetchFromGitHub , fetchFromGitHub
, freeglut , libglut
, freetype , freetype
, gtk2-x11 , gtk2-x11
, lib , lib
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
curl curl
dbus dbus
libepoxy libepoxy
freeglut libglut
freetype freetype
gtk2-x11 gtk2-x11
libGL libGL

4
pkgs/by-name/ch/chow-phaser/package.nix
View file

@ -1,4 +1,4 @@
{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut { alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, libglut
, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext , freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext
, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux , libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux
, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
curl curl
dbus dbus
libepoxy libepoxy
freeglut libglut
freetype freetype
gtk3 gtk3
libGL libGL

4
pkgs/by-name/ch/chow-tape-model/package.nix
View file

@ -5,7 +5,7 @@
, dbus , dbus
, libepoxy , libepoxy
, fetchFromGitHub , fetchFromGitHub
, freeglut , libglut
, freetype , freetype
, gtk3 , gtk3
, lib , lib
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
curl curl
dbus dbus
libepoxy libepoxy
freeglut libglut
freetype freetype
gtk3 gtk3
libGL libGL

4
pkgs/by-name/ja/jasper/package.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, freeglut , libglut
, libGL , libGL
, libheif , libheif
, libjpeg , libjpeg
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals enableJPGCodec [ ] ++ lib.optionals enableJPGCodec [
libjpeg libjpeg
] ++ lib.optionals enableOpenGL [ ] ++ lib.optionals enableOpenGL [
freeglut libglut
libGL libGL
]; ];

4
pkgs/by-name/li/linux-wallpaperengine/package.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, ffmpeg , ffmpeg
, freeglut , libglut
, freeimage , freeimage
, glew , glew
, glfw , glfw
@ -44,7 +44,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
ffmpeg ffmpeg
freeglut libglut
freeimage freeimage
glew glew
glfw glfw

4
pkgs/by-name/me/mednafen/package.nix
View file

@ -5,7 +5,7 @@
alsa-lib, alsa-lib,
fetchurl, fetchurl,
flac, flac,
freeglut, libglut,
libGL, libGL,
libGLU, libGLU,
libX11, libX11,
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2 SDL2
SDL2_net SDL2_net
flac flac
freeglut libglut
libcdio libcdio
libjack2 libjack2
libsamplerate libsamplerate

4
pkgs/by-name/op/openctm/package.nix
View file

@ -3,7 +3,7 @@
stdenv, stdenv,
fetchurl, fetchurl,
pkg-config, pkg-config,
freeglut, libglut,
gtk2, gtk2,
libGLU, libGLU,
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
freeglut libglut
gtk2 gtk2
libGLU libGLU
]; ];

4
pkgs/development/cuda-modules/cuda/overrides.nix
View file

@ -235,7 +235,7 @@ filterAndCreateOverrides {
cuda_demo_suite = cuda_demo_suite =
{ {
freeglut, libglut,
libcufft, libcufft,
libcurand, libcurand,
libGLU, libGLU,
@ -244,7 +244,7 @@ filterAndCreateOverrides {
}: }:
prevAttrs: { prevAttrs: {
buildInputs = prevAttrs.buildInputs ++ [ buildInputs = prevAttrs.buildInputs ++ [
freeglut libglut
libcufft.lib libcufft.lib
libcurand.lib libcurand.lib
libGLU libGLU

4
pkgs/development/cuda-modules/cudatoolkit/default.nix
View file

@ -35,7 +35,7 @@
wayland, wayland,
xorg, xorg,
zlib, zlib,
freeglut, libglut,
libGLU, libGLU,
libsForQt5, libsForQt5,
libtiff, libtiff,
@ -85,7 +85,7 @@ backendStdenv.mkDerivation rec {
buildInputs = buildInputs =
lib.optionals (lib.versionOlder version "11") [ lib.optionals (lib.versionOlder version "11") [
libsForQt5.qt5.qtwebengine libsForQt5.qt5.qtwebengine
freeglut libglut
libGLU libGLU
] ]
++ [ ++ [

4
pkgs/development/interpreters/io/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo, { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, libxml2, libglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype zlib sqlite gmp libffi cairo ncurses freetype
libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl libglut libsamplerate pcre libevent libedit yajl
glfw openssl libpthreadstubs libXdmcp glfw openssl libpthreadstubs libXdmcp
libmemcached python3 libmemcached python3
]; ];

4
pkgs/development/libraries/box2d/default.nix
View file

@ -4,7 +4,7 @@
, cmake , cmake
, libGLU , libGLU
, libGL , libGL
, freeglut , libglut
, libX11 , libX11
, libXcursor , libXcursor
, libXinerama , libXinerama
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
libGLU libGLU
libGL libGL
freeglut libglut
libX11 libX11
libXcursor libXcursor
libXinerama libXinerama

4
pkgs/development/libraries/bullet/default.nix
View file

@ -4,7 +4,7 @@
, cmake , cmake
, libGLU , libGLU
, libGL , libGL
, freeglut , libglut
, Cocoa , Cocoa
, OpenGL , OpenGL
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
postPatch = '' postPatch = ''

4
pkgs/development/libraries/bullet/roboschool-fork.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut { lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, libglut
, Cocoa, OpenGL , Cocoa, OpenGL
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ]; patches = [ ./gwen-narrowing.patch ];

4
pkgs/development/libraries/chipmunk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto { lib, stdenv, fetchurl, cmake, libglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
, libXi, libXmu, fetchpatch, libXrandr , libXi, libXmu, fetchpatch, libXrandr
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = buildInputs =
[ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; [ libglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ];
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/bin

4
pkgs/development/libraries/freenect/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, freeglut, libGLU, libGL, libXi, libXmu { stdenv, lib, fetchFromGitHub, cmake, libusb1, pkg-config, libglut, libGLU, libGL, libXi, libXmu
, GLUT, Cocoa , GLUT, Cocoa
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU="; sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU=";
}; };
buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ]
++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/development/libraries/ftgl/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, doxygen , doxygen
, freeglut , libglut
, freetype , freetype
, libGL , libGL
, libGLU , libGLU
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
] else [ ] else [
libGL libGL
libGLU libGLU
freeglut libglut
]); ]);
configureFlags = [ configureFlags = [

4
pkgs/development/libraries/gl2ps/default.nix
View file

@ -6,7 +6,7 @@
, libpng , libpng
, libGL , libGL
, libGLU , libGLU
, freeglut , libglut
, darwin , darwin
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
libGL libGL
libGLU libGLU
freeglut libglut
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.OpenGL
]; ];

4
pkgs/development/libraries/gle/default.nix
View file

@ -1,8 +1,8 @@
{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: {lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gle"; pname = "gle";
version = "3.1.0"; version = "3.1.0";
buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext];
src = fetchurl { src = fetchurl {
urls = [ urls = [
"mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz"

4
pkgs/development/libraries/glui/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, freeglut , libglut
, libGL , libGL
, libGLU , libGLU
, libX11 , libX11
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i"; sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i";
}; };
buildInputs = [ freeglut libGLU libGL libXmu libXext libX11 libXi ]; buildInputs = [ libglut libGLU libGL libXmu libXext libX11 libXi ];
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,lib,share/glui/doc,include} mkdir -p "$out"/{bin,lib,share/glui/doc,include}

4
pkgs/development/libraries/libsurvive/default.nix
View file

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkg-config , pkg-config
, freeglut , libglut
, lapack , lapack
, libusb1 , libusb1
, blas , blas
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
freeglut libglut
lapack lapack
libusb1 libusb1
blas blas

4
pkgs/development/libraries/libwebp/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
, threadingSupport ? true # multi-threading , threadingSupport ? true # multi-threading
, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp) , openglSupport ? false, libglut, libGL, libGLU # OpenGL (required for vwebp)
, pngSupport ? true, libpng # PNG image format , pngSupport ? true, libpng # PNG image format
, jpegSupport ? true, libjpeg # JPEG image format , jpegSupport ? true, libjpeg # JPEG image format
, tiffSupport ? true, libtiff # TIFF image format , tiffSupport ? true, libtiff # TIFF image format
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook libtool ]; nativeBuildInputs = [ autoreconfHook libtool ];
buildInputs = [ ] buildInputs = [ ]
++ lib.optionals openglSupport [ freeglut libGL libGLU ] ++ lib.optionals openglSupport [ libglut libGL libGLU ]
++ lib.optionals pngSupport [ libpng ] ++ lib.optionals pngSupport [ libpng ]
++ lib.optionals jpegSupport [ libjpeg ] ++ lib.optionals jpegSupport [ libjpeg ]
++ lib.optionals tiffSupport [ libtiff ] ++ lib.optionals tiffSupport [ libtiff ]

4
pkgs/development/libraries/ogre/default.nix
View file

@ -12,7 +12,7 @@
, pugixml , pugixml
, zziplib , zziplib
# linux # linux
, freeglut , libglut
, libGL , libGL
, libGLU , libGLU
, libICE , libICE
@ -75,7 +75,7 @@ let
pugixml pugixml
zziplib zziplib
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
freeglut libglut
libGL libGL
libGLU libGLU
libICE libICE

6
pkgs/development/libraries/opencolorio/default.nix
View file

@ -10,7 +10,7 @@
, minizip-ng , minizip-ng
# Only required on Linux # Only required on Linux
, glew , glew
, freeglut , libglut
# Only required on Darwin # Only required on Darwin
, Carbon , Carbon
, GLUT , GLUT
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
pystring pystring
imath imath
minizip-ng minizip-ng
] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew libglut ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]
++ lib.optionals buildApps [ ++ lib.optionals buildApps [
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DOCIO_INSTALL_EXT_PACKAGES=NONE" "-DOCIO_INSTALL_EXT_PACKAGES=NONE"
"-DOCIO_USE_SSE2NEON=OFF" "-DOCIO_USE_SSE2NEON=OFF"
# GPU test fails with: freeglut (GPU tests): failed to open display '' # GPU test fails with: libglut (GPU tests): failed to open display ''
"-DOCIO_BUILD_GPU_TESTS=OFF" "-DOCIO_BUILD_GPU_TESTS=OFF"
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng"
] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"

4
pkgs/development/libraries/opencsg/default.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 {lib, stdenv, fetchurl, libGLU, libGL, libglut, glew, libXmu, libXext, libX11
, qmake, GLUT, fixDarwinDylibNames }: , qmake, GLUT, fixDarwinDylibNames }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ glew ] buildInputs = [ glew ]
++ lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] ++ lib.optionals stdenv.isLinux [ libGLU libGL libglut libXmu libXext libX11 ]
++ lib.optional stdenv.isDarwin GLUT; ++ lib.optional stdenv.isDarwin GLUT;
doCheck = false; doCheck = false;

4
pkgs/development/libraries/partio/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, unzip , unzip
, cmake , cmake
, freeglut , libglut
, libGLU , libGLU
, libGL , libGL
, zlib , zlib
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
darwin.apple_sdk.frameworks.GLUT darwin.apple_sdk.frameworks.GLUT
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
freeglut libglut
libGLU libGLU
libGL libGL
]; ];

4
pkgs/development/libraries/plib/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, freeglut, SDL { fetchurl, fetchpatch, lib, stdenv, libGLU, libGL, libglut, SDL
, libXi, libSM, libXmu, libXext, libX11 }: , libXi, libSM, libXmu, libXext, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
libGLU libGL freeglut SDL libGLU libGL libglut SDL
# The following libs ought to be propagated build inputs of Mesa. # The following libs ought to be propagated build inputs of Mesa.
libXi libSM libXmu libXext libX11 libXi libSM libXmu libXext libX11

4
pkgs/development/libraries/science/biology/bicgl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu, GLUT }: { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, libglut, mesa_glu, GLUT }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bicgl"; pname = "bicgl";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libminc bicpl mesa_glu ] buildInputs = [ libminc bicpl mesa_glu ]
++ lib.optionals stdenv.isDarwin [ GLUT ] ++ lib.optionals stdenv.isDarwin [ GLUT ]
++ lib.optionals stdenv.isLinux [ freeglut ]; ++ lib.optionals stdenv.isLinux [ libglut ];
cmakeFlags = [ cmakeFlags = [
"-DLIBMINC_DIR=${libminc}/lib/cmake" "-DLIBMINC_DIR=${libminc}/lib/cmake"

4
pkgs/development/libraries/simgear/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi { lib, stdenv, fetchurl, plib, libglut, xorgproto, libX11, libXext, libXi
, libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut , libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut
, openscenegraph, openal, expat, cmake, apr, xz , openscenegraph, openal, expat, cmake, apr, xz
, curl , curl
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi buildInputs = [ plib libglut xorgproto libX11 libXext libXi
libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut
openscenegraph openal expat apr curl xz ]; openscenegraph openal expat apr curl xz ];

2
pkgs/development/lisp-modules/ql.nix
View file

@ -129,7 +129,7 @@ let
nativeLibs = [ pkgs.libGLU ]; nativeLibs = [ pkgs.libGLU ];
}); });
cl-glut = super.cl-glut.overrideLispAttrs (o: { cl-glut = super.cl-glut.overrideLispAttrs (o: {
nativeLibs = [ pkgs.freeglut ]; nativeLibs = [ pkgs.libglut ];
}); });
cl-glfw = super.cl-glfw.overrideLispAttrs (o: { cl-glfw = super.cl-glfw.overrideLispAttrs (o: {
nativeLibs = [ pkgs.glfw ]; nativeLibs = [ pkgs.glfw ];

4
pkgs/development/ocaml-modules/lablgl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, camlp-streams, darwin } : { lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, libglut, camlp-streams, darwin } :
if lib.versionOlder ocaml.version "4.06" if lib.versionOlder ocaml.version "4.06"
then throw "lablgl is not available for OCaml ${ocaml.version}" then throw "lablgl is not available for OCaml ${ocaml.version}"
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ freeglut camlp-streams ]; buildInputs = [ libglut camlp-streams ];
propagatedBuildInputs = [ propagatedBuildInputs = [
libGLU libGLU
libGL libGL

6
pkgs/development/python-modules/pyopengl/default.nix
View file

@ -32,7 +32,7 @@ buildPythonPackage rec {
--replace '"GL",' '"${pkgs.libGL}/lib/libGL${ext}",' \ --replace '"GL",' '"${pkgs.libGL}/lib/libGL${ext}",' \
--replace '"GLU",' '"${pkgs.libGLU}/lib/libGLU${ext}",' \ --replace '"GLU",' '"${pkgs.libGLU}/lib/libGLU${ext}",' \
--replace '"GLX",' '"${pkgs.libglvnd}/lib/libGLX${ext}",' \ --replace '"GLX",' '"${pkgs.libglvnd}/lib/libGLX${ext}",' \
--replace '"glut",' '"${pkgs.freeglut}/lib/libglut${ext}",' \ --replace '"glut",' '"${pkgs.libglut}/lib/libglut${ext}",' \
--replace '"GLESv1_CM",' '"${pkgs.libGL}/lib/libGLESv1_CM${ext}",' \ --replace '"GLESv1_CM",' '"${pkgs.libGL}/lib/libGLESv1_CM${ext}",' \
--replace '"GLESv2",' '"${pkgs.libGL}/lib/libGLESv2${ext}",' \ --replace '"GLESv2",' '"${pkgs.libGL}/lib/libGLESv2${ext}",' \
--replace '"gle",' '"${pkgs.gle}/lib/libgle${ext}",' \ --replace '"gle",' '"${pkgs.gle}/lib/libgle${ext}",' \
@ -40,14 +40,14 @@ buildPythonPackage rec {
substituteInPlace OpenGL/platform/egl.py \ substituteInPlace OpenGL/platform/egl.py \
--replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${ext}')" \ --replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${ext}')" \
--replace "'GLU'," "'${pkgs.libGLU}/lib/libGLU${ext}'," \ --replace "'GLU'," "'${pkgs.libGLU}/lib/libGLU${ext}'," \
--replace "'glut'," "'${pkgs.freeglut}/lib/libglut${ext}'," \ --replace "'glut'," "'${pkgs.libglut}/lib/libglut${ext}'," \
--replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \ --replace "'GLESv1_CM'," "'${pkgs.libGL}/lib/libGLESv1_CM${ext}'," \
--replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \ --replace "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \
--replace "'gle'," '"${pkgs.gle}/lib/libgle${ext}",' \ --replace "'gle'," '"${pkgs.gle}/lib/libgle${ext}",' \
--replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}'," --replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}',"
substituteInPlace OpenGL/platform/darwin.py \ substituteInPlace OpenGL/platform/darwin.py \
--replace "'OpenGL'," "'${pkgs.libGL}/lib/libGL${ext}'," \ --replace "'OpenGL'," "'${pkgs.libGL}/lib/libGL${ext}'," \
--replace "'GLUT'," "'${pkgs.freeglut}/lib/libglut${ext}'," --replace "'GLUT'," "'${pkgs.libglut}/lib/libglut${ext}',"
'' ''
+ '' + ''
# https://github.com/NixOS/nixpkgs/issues/76822 # https://github.com/NixOS/nixpkgs/issues/76822

4
pkgs/development/rocm-modules/5/clr/test-opencl-example.nix
View file

@ -6,7 +6,7 @@
, cmake , cmake
, pkg-config , pkg-config
, glew , glew
, freeglut , libglut
, opencl-headers , opencl-headers
, ocl-icd , ocl-icd
}: }:
@ -26,7 +26,7 @@ let
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glew freeglut opencl-headers ocl-icd ]; buildInputs = [ glew libglut opencl-headers ocl-icd ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

4
pkgs/development/rocm-modules/6/clr/test-opencl-example.nix
View file

@ -6,7 +6,7 @@
, cmake , cmake
, pkg-config , pkg-config
, glew , glew
, freeglut , libglut
, opencl-headers , opencl-headers
, ocl-icd , ocl-icd
}: }:
@ -26,7 +26,7 @@ let
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glew freeglut opencl-headers ocl-icd ]; buildInputs = [ glew libglut opencl-headers ocl-icd ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

4
pkgs/development/tools/simavr/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut { lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, libglut
, avrgcc, avrlibc , avrgcc, avrlibc
, libGLU, libGL , libGLU, libGL
, GLUT }: , GLUT }:
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ which pkg-config avrgcc ] nativeBuildInputs = [ which pkg-config avrgcc ]
++ lib.optional stdenv.isDarwin setupHookDarwin; ++ lib.optional stdenv.isDarwin setupHookDarwin;
buildInputs = [ libelf freeglut libGLU libGL ] buildInputs = [ libelf libglut libGLU libGL ]
++ lib.optional stdenv.isDarwin GLUT; ++ lib.optional stdenv.isDarwin GLUT;
# remove forbidden references to $TMPDIR # remove forbidden references to $TMPDIR

4
pkgs/games/chromium-bsu/default.nix
View file

@ -6,7 +6,7 @@
, SDL2_mixer , SDL2_mixer
, fontconfig , fontconfig
, freealut , freealut
, freeglut , libglut
, ftgl , ftgl
, gettext , gettext
, glpng , glpng
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
SDL2_mixer SDL2_mixer
fontconfig fontconfig
freealut freealut
freeglut libglut
ftgl ftgl
glpng glpng
libGL libGL

4
pkgs/games/construo/default.nix
View file

@ -5,7 +5,7 @@
, xorgproto , xorgproto
, libGL ? null , libGL ? null
, libGLU ? null , libGLU ? null
, freeglut ? null , libglut ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 zlib xorgproto ] buildInputs = [ libX11 zlib xorgproto ]
++ lib.optional (libGL != null) libGL ++ lib.optional (libGL != null) libGL
++ lib.optional (libGLU != null) libGLU ++ lib.optional (libGLU != null) libGLU
++ lib.optional (freeglut != null) freeglut; ++ lib.optional (libglut != null) libglut;
preConfigure = '' preConfigure = ''
substituteInPlace src/Makefile.in \ substituteInPlace src/Makefile.in \

4
pkgs/games/crack-attack/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: { lib, stdenv, fetchurl, pkg-config, gtk2, libglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crack-attack"; pname = "crack-attack";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; buildInputs = [ gtk2 libglut SDL SDL_mixer libGLU libGL libXi libXmu ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/games/extremetuxracer/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype { lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, libglut, freetype
, sfml, libXi , sfml, libXi
, libXmu, libXext, libXt, libSM, libICE , libXmu, libXext, libXt, libSM, libICE
, libpng, pkg-config, gettext, intltool , libpng, pkg-config, gettext, intltool
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ buildInputs = [
libGLU libGL libX11 xorgproto tcl freeglut freetype libGLU libGL libX11 xorgproto tcl libglut freetype
sfml libXi sfml libXi
libXmu libXext libXt libSM libICE libXmu libXext libXt libSM libICE
libpng gettext libpng gettext

4
pkgs/games/flightgear/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, wrapQtAppsHook { lib, stdenv, fetchurl, wrapQtAppsHook
, freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib , libglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib
, libSM, libunwind, libX11, xorgproto, libXext, libXi , libSM, libunwind, libX11, xorgproto, libXext, libXi
, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
, makeDesktopItem, qtbase, qtdeclarative, glew, curl , makeDesktopItem, qtbase, qtdeclarative, glew, curl
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ buildInputs = [
freeglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib libglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib
libSM libunwind libX11 xorgproto libXext libXi libSM libunwind libX11 xorgproto libXext libXi
libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase
glew qtdeclarative curl glew qtdeclarative curl

4
pkgs/games/gl-117/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, libGLU, libGL, SDL, freeglut, SDL_mixer, autoconf, automake, libtool , libGLU, libGL, SDL, libglut, SDL_mixer, autoconf, automake, libtool
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ automake autoconf ]; nativeBuildInputs = [ automake autoconf ];
buildInputs = [ libGLU libGL SDL freeglut SDL_mixer libtool ]; buildInputs = [ libGLU libGL SDL libglut SDL_mixer libtool ];
meta = with lib; { meta = with lib; {
description = "Air combat simulator"; description = "Air combat simulator";

4
pkgs/games/gl-gsync-demo/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: { stdenv, fetchFromGitHub, libX11, libglut, glew, libXNVCtrl, libXext, lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gl-gsync-demo"; pname = "gl-gsync-demo";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d";
}; };
buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; buildInputs = [ libX11 libglut glew libXNVCtrl libXext ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

6
pkgs/games/hedgewars/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, freeglut { stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, libglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook , qtbase, qttools, wrapQtAppsHook
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_4 freeglut physfs ffmpeg_4 libglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU libglut physfs ]}"
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/games/methane/default.nix
View file

@ -7,7 +7,7 @@
, SDL2_mixer , SDL2_mixer
, fontconfig , fontconfig
, freealut , freealut
, freeglut , libglut
, gettext , gettext
, libGL , libGL
, libGLU , libGLU
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
SDL2_mixer SDL2_mixer
fontconfig fontconfig
freealut freealut
freeglut libglut
libGL libGL
libGLU libGLU
openal openal

6
pkgs/games/newtonwars/default.nix
View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
, freeglut , libglut
, libGLU , libGLU
, libGL , libGL
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ freeglut libGL libGLU ]; buildInputs = [ libglut libGL libGLU ];
patchPhase = '' patchPhase = ''
sed -i "s;font24.raw;$out/share/font24.raw;g" display.c sed -i "s;font24.raw;$out/share/font24.raw;g" display.c
@ -33,7 +33,7 @@ stdenv.mkDerivation {
cp font24.raw $out/share cp font24.raw $out/share
wrapProgram $out/bin/nw \ wrapProgram $out/bin/nw \
--prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ --prefix LD_LIBRARY_PATH ":" ${libglut}/lib \
--prefix LD_LIBRARY_PATH ":" ${libGLU}/lib \ --prefix LD_LIBRARY_PATH ":" ${libGLU}/lib \
--prefix LD_LIBRARY_PATH ":" ${libGL}/lib --prefix LD_LIBRARY_PATH ":" ${libGL}/lib
''; '';

4
pkgs/games/space-orbit/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, freeglut , libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, libglut
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.01"; version = "1.01";
patchversion = "9"; patchversion = "9";
buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu freeglut ]; buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu libglut ];
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz";

4
pkgs/games/speed-dreams/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, { fetchurl, lib, stdenv, libGLU, libGL, libglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat,
libpng, zlib, bash, SDL2, SDL2_mixer, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl, copyDesktopItems, makeDesktopItem }: libpng, zlib, bash, SDL2, SDL2_mixer, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl, copyDesktopItems, makeDesktopItem }:
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake copyDesktopItems ]; nativeBuildInputs = [ pkg-config cmake copyDesktopItems ];
buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto buildInputs = [ libpng libGLU libGL libglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat
SDL2 SDL2_mixer enet libjpeg openscenegraph libvorbis curl ]; SDL2 SDL2_mixer enet libjpeg openscenegraph libvorbis curl ];

2
pkgs/games/steam/fhsenv.nix
View file

@ -162,7 +162,7 @@ in buildFHSEnv rec {
gtk2 gtk2
bzip2 bzip2
flac flac
freeglut libglut
libjpeg libjpeg
libpng libpng
libpng12 libpng12

4
pkgs/games/torcs/default.nix
View file

@ -1,4 +1,4 @@
{ fetchpatch, fetchurl, lib, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, { fetchpatch, fetchurl, lib, stdenv, libGLU, libglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
libpng, zlib, makeWrapper }: libpng, zlib, makeWrapper }:
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto buildInputs = [ libGLU libglut libX11 plib openal freealut libXrandr xorgproto
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ];
installTargets = "install datainstall"; installTargets = "install datainstall";

4
pkgs/misc/screensavers/electricsheep/default.nix
View file

@ -13,7 +13,7 @@
, libgtop , libgtop
, boost179 , boost179
, tinyxml , tinyxml
, freeglut , libglut
, libGLU , libGLU
, libGL , libGL
, glee , glee
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
libgtop libgtop
boost179 boost179
tinyxml tinyxml
freeglut libglut
libGLU libGLU
libGL libGL
glee glee

4
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchzip, qtbase, qtscxml, cmake, asciidoc { lib, stdenv, fetchzip, qtbase, qtscxml, cmake, asciidoc
, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config , docbook_xsl, json_c, mesa_glu, libglut, trace-cmd, pkg-config
, libtraceevent, libtracefs, freefont_ttf, wrapQtAppsHook, qtwayland , libtraceevent, libtracefs, freefont_ttf, wrapQtAppsHook, qtwayland
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
buildInputs = [ qtbase qtscxml qtwayland json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ]; buildInputs = [ qtbase qtscxml qtwayland json_c mesa_glu libglut libtraceevent libtracefs trace-cmd ];
cmakeFlags = [ cmakeFlags = [
"-D_INSTALL_PREFIX=${placeholder "out"}" "-D_INSTALL_PREFIX=${placeholder "out"}"

4
pkgs/tools/graphics/asymptote/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake, pkg-config , autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake, pkg-config
, freeglut, ghostscriptX, imagemagick, fftw, eigen, libtirpc , libglut, ghostscriptX, imagemagick, fftw, eigen, libtirpc
, boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv
, python3, qtbase, qtsvg, boost , python3, qtbase, qtsvg, boost
, zlib, perl, curl , zlib, perl, curl
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [ propagatedBuildInputs = [
glm glm
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
freeglut libGLU libGL libglut libGLU libGL
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
OpenGL GLUT Cocoa OpenGL GLUT Cocoa
]); ]);

4
pkgs/tools/graphics/enblend-enfuse/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchhg { lib, stdenv, fetchhg
, autoreconfHook , autoreconfHook
, boost , boost
, freeglut , libglut
, glew , glew
, gsl , gsl
, lcms2 , lcms2
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc="; sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc=";
}; };
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; buildInputs = [ boost libglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ];
nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texliveSmall ]; nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texliveSmall ];

4
pkgs/tools/graphics/mesa-demos/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, freeglut , libglut
, libGL , libGL
, libGLU , libGLU
, libX11 , libX11
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
freeglut libglut
libX11 libX11
libXext libXext
libGL libGL

4
pkgs/tools/graphics/pfstools/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin
, openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat , openexr, zlib, imagemagick6, libGLU, libGL, libglut, fftwFloat
, fftw, gsl, libexif, perl, qtbase, netpbm , fftw, gsl, libexif, perl, qtbase, netpbm
, enableUnfree ? false, opencv2 , enableUnfree ? false, opencv2
}: }:
@ -35,7 +35,7 @@ mkDerivation rec {
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT OpenGL GLUT
]) else [ ]) else [
libGLU libGL freeglut libGLU libGL libglut
]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });
patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ];

4
pkgs/tools/graphics/piglit/default.nix
View file

@ -2,7 +2,7 @@
, fetchFromGitLab , fetchFromGitLab
, lib , lib
, cmake , cmake
, freeglut , libglut
, libGL , libGL
, libGLU , libGLU
, libglvnd , libglvnd
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
freeglut libglut
libGL libGL
libGLU libGLU
libglvnd libglvnd

4
pkgs/tools/graphics/twilight/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, libGL, libGLU, freeglut, libX11 }: , libGL, libGLU, libglut, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "twilight"; pname = "twilight";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz";
}; };
buildInputs = [ libGL libGLU freeglut libX11 ]; buildInputs = [ libGL libGLU libglut libX11 ];
installPhase = '' installPhase = ''
install -Dm755 twilight $out/bin/twilight install -Dm755 twilight $out/bin/twilight

4
pkgs/tools/misc/hdaps-gl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: { lib, stdenv, fetchFromGitHub, autoreconfHook, libglut, libGL, libGLU }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hdaps-gl"; pname = "hdaps-gl";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ freeglut libGL libGLU ]; buildInputs = [ libglut libGL libGLU ];
meta = with lib; { meta = with lib; {
description = "GL-based laptop model that rotates in real-time via hdaps"; description = "GL-based laptop model that rotates in real-time via hdaps";

6
pkgs/top-level/all-packages.nix
View file

@ -2864,7 +2864,7 @@ with pkgs;
x16-run = x16.run; x16-run = x16.run;
yabause = libsForQt5.callPackage ../applications/emulators/yabause { yabause = libsForQt5.callPackage ../applications/emulators/yabause {
freeglut = null; libglut = null;
openal = null; openal = null;
}; };
@ -36441,11 +36441,11 @@ with pkgs;
construoBase = lowPrio (callPackage ../games/construo { construoBase = lowPrio (callPackage ../games/construo {
libGL = null; libGL = null;
libGLU = null; libGLU = null;
freeglut = null; libglut = null;
}); });
construo = construoBase.override { construo = construoBase.override {
inherit libGL libGLU freeglut; inherit libGL libGLU libglut;
}; };
crack_attack = callPackage ../games/crack-attack { }; crack_attack = callPackage ../games/crack-attack { };

4
pkgs/top-level/perl-packages.nix
View file

@ -19594,7 +19594,7 @@ with self; {
}; };
# FIXME: try with libGL + libGLU instead of libGLU libGL # FIXME: try with libGL + libGLU instead of libGLU libGL
buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.libglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ];
patches = [ ../development/perl-modules/perl-opengl.patch ]; patches = [ ../development/perl-modules/perl-opengl.patch ];
@ -20301,7 +20301,7 @@ with self; {
nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ];
buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++
(with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); (with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]);
propagatedBuildInputs = [ propagatedBuildInputs = [
AstroFITSHeader AstroFITSHeader