From fbda1dbfd648632226b2953dd87f15955d659f4f Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 20 Jun 2024 05:39:23 +0100 Subject: [PATCH] treewide: replace freeglut with libglut 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. --- pkgs/applications/audio/pd-plugins/gem/default.nix | 4 ++-- pkgs/applications/audio/sndpeek/default.nix | 4 ++-- pkgs/applications/emulators/yabause/default.nix | 4 ++-- pkgs/applications/graphics/fluxus/default.nix | 4 ++-- pkgs/applications/graphics/freepv/default.nix | 4 ++-- pkgs/applications/graphics/opentoonz/default.nix | 4 ++-- pkgs/applications/misc/icesl/default.nix | 4 ++-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/mupdf/1.17/default.nix | 6 +++--- pkgs/applications/science/astronomy/celestia/default.nix | 4 ++-- pkgs/applications/science/geometry/antiprism/default.nix | 4 ++-- pkgs/applications/science/math/glsurf/default.nix | 4 ++-- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- pkgs/applications/science/misc/foldingathome/viewer.nix | 4 ++-- pkgs/build-support/appimage/default.nix | 2 +- pkgs/by-name/ch/chow-kick/package.nix | 4 ++-- pkgs/by-name/ch/chow-phaser/package.nix | 4 ++-- pkgs/by-name/ch/chow-tape-model/package.nix | 4 ++-- pkgs/by-name/ja/jasper/package.nix | 4 ++-- pkgs/by-name/li/linux-wallpaperengine/package.nix | 4 ++-- pkgs/by-name/me/mednafen/package.nix | 4 ++-- pkgs/by-name/op/openctm/package.nix | 4 ++-- pkgs/development/cuda-modules/cuda/overrides.nix | 4 ++-- pkgs/development/cuda-modules/cudatoolkit/default.nix | 4 ++-- pkgs/development/interpreters/io/default.nix | 4 ++-- pkgs/development/libraries/box2d/default.nix | 4 ++-- pkgs/development/libraries/bullet/default.nix | 4 ++-- pkgs/development/libraries/bullet/roboschool-fork.nix | 4 ++-- pkgs/development/libraries/chipmunk/default.nix | 4 ++-- pkgs/development/libraries/freenect/default.nix | 4 ++-- pkgs/development/libraries/ftgl/default.nix | 4 ++-- pkgs/development/libraries/gl2ps/default.nix | 4 ++-- pkgs/development/libraries/gle/default.nix | 4 ++-- pkgs/development/libraries/glui/default.nix | 4 ++-- pkgs/development/libraries/libsurvive/default.nix | 4 ++-- pkgs/development/libraries/libwebp/default.nix | 4 ++-- pkgs/development/libraries/ogre/default.nix | 4 ++-- pkgs/development/libraries/opencolorio/default.nix | 6 +++--- pkgs/development/libraries/opencsg/default.nix | 4 ++-- pkgs/development/libraries/partio/default.nix | 4 ++-- pkgs/development/libraries/plib/default.nix | 4 ++-- .../development/libraries/science/biology/bicgl/default.nix | 4 ++-- pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/development/lisp-modules/ql.nix | 2 +- pkgs/development/ocaml-modules/lablgl/default.nix | 4 ++-- pkgs/development/python-modules/pyopengl/default.nix | 6 +++--- pkgs/development/rocm-modules/5/clr/test-opencl-example.nix | 4 ++-- pkgs/development/rocm-modules/6/clr/test-opencl-example.nix | 4 ++-- pkgs/development/tools/simavr/default.nix | 4 ++-- pkgs/games/chromium-bsu/default.nix | 4 ++-- pkgs/games/construo/default.nix | 4 ++-- pkgs/games/crack-attack/default.nix | 4 ++-- pkgs/games/extremetuxracer/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/games/gl-117/default.nix | 4 ++-- pkgs/games/gl-gsync-demo/default.nix | 4 ++-- pkgs/games/hedgewars/default.nix | 6 +++--- pkgs/games/methane/default.nix | 4 ++-- pkgs/games/newtonwars/default.nix | 6 +++--- pkgs/games/space-orbit/default.nix | 4 ++-- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/steam/fhsenv.nix | 2 +- pkgs/games/torcs/default.nix | 4 ++-- pkgs/misc/screensavers/electricsheep/default.nix | 4 ++-- pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++-- pkgs/tools/graphics/mesa-demos/default.nix | 4 ++-- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- pkgs/tools/graphics/piglit/default.nix | 4 ++-- pkgs/tools/graphics/twilight/default.nix | 4 ++-- pkgs/tools/misc/hdaps-gl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- pkgs/top-level/perl-packages.nix | 4 ++-- 74 files changed, 150 insertions(+), 150 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 7bfdb1bd8a8a..5cb308988a4f 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -7,7 +7,7 @@ , libGL , libGLU , glew -, freeglut +, libglut , libv4l , libX11 , file @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libGL libGLU glew - freeglut + libglut libv4l libX11 ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index c65208343aff..7cf8636ad107 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -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 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pthread.patch ]; buildInputs = [ - freeglut + libglut alsa-lib mesa libGLU diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 53fcc870f1a1..7623cc49efb9 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL -, freeglut ? null, openal ? null, SDL2 ? null }: +, libglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { pname = "yabause"; @@ -11,7 +11,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 5491305fad2c..cb32981aef0f 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , alsa-lib , fftw -, freeglut +, libglut , freetype , glew , libjack2 @@ -33,7 +33,7 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib fftw - freeglut.dev + libglut.dev freetype glew libjack2 diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index def7e3e9dd86..1ff0fd5146df 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libGLU , libGL -, freeglut +, libglut , zlib , cmake , libX11 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; + buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 1dd460c2e1d2..a474550820ba 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,7 +1,7 @@ { boost , cmake , fetchFromGitHub -, freeglut +, libglut , freetype , glew , libjpeg @@ -93,7 +93,7 @@ stdenv.mkDerivation { buildInputs = [ boost - freeglut + libglut freetype glew libjpeg diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 1a079ab8274c..aeeb82ba581f 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -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 }: 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 stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31..6f9d02320401 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -62,7 +62,7 @@ in buildFHSEnv { fontconfig SDL2_ttf # Mednafen - freeglut mesa_glu + libglut mesa_glu # MESS expat diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix index b8cb75b057fd..a3848ccc078b 100644 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ b/pkgs/applications/misc/mupdf/1.17/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, libGLU +, enableGL ? true, libglut, libGLU }: let @@ -33,14 +33,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; 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 enableCurl [ curl openssl ] ++ lib.optionals enableGL ( if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut libGLU ]) + [ libglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 8b40196fdbff..3347fa5356b5 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -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 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - freeglut gtk2 gtkglext lua perl + libglut gtk2 gtkglext lua perl libjpeg_turbo libtheora libXmu libGLU libGL ]; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 62ffc099dc6c..eca8b6f5f2b8 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -4,7 +4,7 @@ , libX11 , libGL , libGLU -, freeglut }: +, libglut }: stdenv.mkDerivation rec { pname = "antiprism"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + buildInputs = [ libX11 libGLU libGL.dev libglut.dev ]; meta = with lib; { homepage = "https://www.antiprism.com"; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 38caee5805b4..0edaa32babd7 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -5,7 +5,7 @@ , makeWrapper , libGLU , libGL -, freeglut +, libglut , mpfr , gmp , pkgsHostTarget @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - freeglut + libglut libGL libGLU mpfr diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 68134a99a203..199759437e91 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -10,7 +10,7 @@ , libGL , libXmu , libXi -, freeglut +, libglut , libjpeg , libtool , wxGTK32 @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libGL libXmu libXi - freeglut + libglut libjpeg wxGTK32 gtk3 diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 7f28c8d1b146..bb2c3c0abe30 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -2,7 +2,7 @@ , autoPatchelfHook , dpkg , fetchurl -, freeglut +, libglut , gcc-unwrapped , libGL , libGLU @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut gcc-unwrapped.lib libGL libGLU diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0d44a5ab23e9..c4ea9371cfcd 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -162,7 +162,7 @@ rec { vulkan-loader flac - freeglut + libglut libjpeg libpng12 libpulseaudio diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index b9dec059d1f1..da2e44d73d80 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -6,7 +6,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk2-x11 , lib @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk2-x11 libGL diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 23cfe684d81f..fd329070d0aa 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -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 , libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 44fc35073d36..89c58fcaf4b1 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -5,7 +5,7 @@ , dbus , libepoxy , fetchFromGitHub -, freeglut +, libglut , freetype , gtk3 , lib @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus libepoxy - freeglut + libglut freetype gtk3 libGL diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 29fd8fd5a9e6..7e51e59e2f34 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -1,7 +1,7 @@ { lib , cmake , fetchFromGitHub -, freeglut +, libglut , libGL , libheif , libjpeg @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableJPGCodec [ libjpeg ] ++ lib.optionals enableOpenGL [ - freeglut + libglut libGL ]; diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 02838ccb83cc..0ec85d195db7 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ffmpeg -, freeglut +, libglut , freeimage , glew , glfw @@ -44,7 +44,7 @@ stdenv.mkDerivation { buildInputs = [ ffmpeg - freeglut + libglut freeimage glew glfw diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix index f3e0f8478c08..88079e48155d 100644 --- a/pkgs/by-name/me/mednafen/package.nix +++ b/pkgs/by-name/me/mednafen/package.nix @@ -5,7 +5,7 @@ alsa-lib, fetchurl, flac, - freeglut, + libglut, libGL, libGLU, libX11, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net flac - freeglut + libglut libcdio libjack2 libsamplerate diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index e255e209111d..169e4469abcd 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - freeglut, + libglut, gtk2, libGLU, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freeglut + libglut gtk2 libGLU ]; diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 5d23d8f7f2a1..f00254e55837 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -235,7 +235,7 @@ filterAndCreateOverrides { cuda_demo_suite = { - freeglut, + libglut, libcufft, libcurand, libGLU, @@ -244,7 +244,7 @@ filterAndCreateOverrides { }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ - freeglut + libglut libcufft.lib libcurand.lib libGLU diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index 24e41d331895..d2f8e2ce3fdf 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -35,7 +35,7 @@ wayland, xorg, zlib, - freeglut, + libglut, libGLU, libsForQt5, libtiff, @@ -85,7 +85,7 @@ backendStdenv.mkDerivation rec { buildInputs = lib.optionals (lib.versionOlder version "11") [ libsForQt5.qt5.qtwebengine - freeglut + libglut libGLU ] ++ [ diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 8a6de1f094d2..64e5b7c4d827 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo, 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 }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 - freeglut libsamplerate pcre libevent libedit yajl + libglut libsamplerate pcre libevent libedit yajl glfw openssl libpthreadstubs libXdmcp libmemcached python3 ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index c2611a8b8dff..2008cab52ac3 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, freeglut +, libglut , libX11 , libXcursor , libXinerama @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGLU libGL - freeglut + libglut libX11 libXcursor libXinerama diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index dc0e1d304eea..5ba9186dcac9 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -4,7 +4,7 @@ , cmake , libGLU , libGL -, freeglut +, libglut , Cocoa , OpenGL }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; postPatch = '' diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 7d601e857001..c5f6f3a436d2 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut +{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, libglut , Cocoa, OpenGL }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] + buildInputs = lib.optionals stdenv.isLinux [ libGLU libGL libglut ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 1cb32dc8ee4b..a0b34f0aa30f 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -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 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; + [ libglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu libXrandr ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 387fac6d84ad..b537bea33777 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -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 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU="; }; - buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] + buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index b6554979c7ee..d1fb07167e13 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , doxygen -, freeglut +, libglut , freetype , libGL , libGLU @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] else [ libGL libGLU - freeglut + libglut ]); configureFlags = [ diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index dfc9e36488f8..f1d67c8c8855 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -6,7 +6,7 @@ , libpng , libGL , libGLU -, freeglut +, libglut , darwin }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU - freeglut + libglut ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL ]; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 79be821faaec..f9ef65197bd5 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -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 { pname = "gle"; version = "3.1.0"; - buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; + buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 716c998b9c99..f3999bfb439b 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, freeglut +, libglut , libGL , libGLU , libX11 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i"; }; - buildInputs = [ freeglut libGLU libGL libXmu libXext libX11 libXi ]; + buildInputs = [ libglut libGLU libGL libXmu libXext libX11 libXi ]; installPhase = '' mkdir -p "$out"/{bin,lib,share/glui/doc,include} diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index dc282886b963..fae57569067a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , pkg-config -, freeglut +, libglut , lapack , libusb1 , blas @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - freeglut + libglut lapack libusb1 blas diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 2662d4e94008..184a48adf0dd 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , 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 , jpegSupport ? true, libjpeg # JPEG image format , tiffSupport ? true, libtiff # TIFF image format @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] - ++ lib.optionals openglSupport [ freeglut libGL libGLU ] + ++ lib.optionals openglSupport [ libglut libGL libGLU ] ++ lib.optionals pngSupport [ libpng ] ++ lib.optionals jpegSupport [ libjpeg ] ++ lib.optionals tiffSupport [ libtiff ] diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 93db5470b0f7..a77529a42704 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -12,7 +12,7 @@ , pugixml , zziplib # linux -, freeglut +, libglut , libGL , libGLU , libICE @@ -75,7 +75,7 @@ let pugixml zziplib ] ++ lib.optionals stdenv.isLinux [ - freeglut + libglut libGL libGLU libICE diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index d5270b655ca1..4563b3ccb311 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -10,7 +10,7 @@ , minizip-ng # Only required on Linux , glew -, freeglut +, libglut # Only required on Darwin , Carbon , GLUT @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pystring imath 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 pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals buildApps [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" "-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" "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index a2675b2d79dc..6ac83dfa7d92 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -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 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 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; doCheck = false; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 75817ff568f7..a567612fae4f 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , unzip , cmake -, freeglut +, libglut , libGLU , libGL , zlib @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT ] ++ lib.optionals (!stdenv.isDarwin) [ - freeglut + libglut libGLU libGL ]; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index c7349c369305..de93d6944c93 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -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 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libGLU libGL freeglut SDL + libGLU libGL libglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index 07d64fbd97ed..afa1299ab9f3 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -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 { pname = "bicgl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc bicpl mesa_glu ] ++ lib.optionals stdenv.isDarwin [ GLUT ] - ++ lib.optionals stdenv.isLinux [ freeglut ]; + ++ lib.optionals stdenv.isLinux [ libglut ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index c66dfb3fdcc8..416274e1c545 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -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 , openscenegraph, openal, expat, cmake, apr, xz , curl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; 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 openscenegraph openal expat apr curl xz ]; diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 93476d78e3a2..0dc9a9d7f0fc 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -129,7 +129,7 @@ let nativeLibs = [ pkgs.libGLU ]; }); cl-glut = super.cl-glut.overrideLispAttrs (o: { - nativeLibs = [ pkgs.freeglut ]; + nativeLibs = [ pkgs.libglut ]; }); cl-glfw = super.cl-glfw.overrideLispAttrs (o: { nativeLibs = [ pkgs.glfw ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index abe1649e0094..6131128a2b82 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -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" then throw "lablgl is not available for OCaml ${ocaml.version}" @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ freeglut camlp-streams ]; + buildInputs = [ libglut camlp-streams ]; propagatedBuildInputs = [ libGLU libGL diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 78cc507e42d8..9c8af0ac924a 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace '"GL",' '"${pkgs.libGL}/lib/libGL${ext}",' \ --replace '"GLU",' '"${pkgs.libGLU}/lib/libGLU${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 '"GLESv2",' '"${pkgs.libGL}/lib/libGLESv2${ext}",' \ --replace '"gle",' '"${pkgs.gle}/lib/libgle${ext}",' \ @@ -40,14 +40,14 @@ buildPythonPackage rec { substituteInPlace OpenGL/platform/egl.py \ --replace "('OpenGL','GL')" "('${pkgs.libGL}/lib/libOpenGL${ext}', '${pkgs.libGL}/lib/libGL${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 "'GLESv2'," "'${pkgs.libGL}/lib/libGLESv2${ext}'," \ --replace "'gle'," '"${pkgs.gle}/lib/libgle${ext}",' \ --replace "'EGL'," "'${pkgs.libGL}/lib/libEGL${ext}'," substituteInPlace OpenGL/platform/darwin.py \ --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 diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix index d6714c6b7d63..65e2e93782e9 100644 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , glew -, freeglut +, libglut , opencl-headers , ocl-icd }: @@ -26,7 +26,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew freeglut opencl-headers ocl-icd ]; + buildInputs = [ glew libglut opencl-headers ocl-icd ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix index 24fc483847d3..940a670ff579 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , glew -, freeglut +, libglut , opencl-headers , ocl-icd }: @@ -26,7 +26,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew freeglut opencl-headers ocl-icd ]; + buildInputs = [ glew libglut opencl-headers ocl-icd ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 8c56bb08a976..deab8539ef14 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, libglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ which pkg-config avrgcc ] ++ lib.optional stdenv.isDarwin setupHookDarwin; - buildInputs = [ libelf freeglut libGLU libGL ] + buildInputs = [ libelf libglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; # remove forbidden references to $TMPDIR diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/games/chromium-bsu/default.nix index f3dfb41c7792..135110028f43 100644 --- a/pkgs/games/chromium-bsu/default.nix +++ b/pkgs/games/chromium-bsu/default.nix @@ -6,7 +6,7 @@ , SDL2_mixer , fontconfig , freealut -, freeglut +, libglut , ftgl , gettext , glpng @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { SDL2_mixer fontconfig freealut - freeglut + libglut ftgl glpng libGL diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 4c9419a54c65..c4d4c50df393 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -5,7 +5,7 @@ , xorgproto , libGL ? null , libGLU ? null -, freeglut ? null +, libglut ? null }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 zlib xorgproto ] ++ lib.optional (libGL != null) libGL ++ lib.optional (libGLU != null) libGLU - ++ lib.optional (freeglut != null) freeglut; + ++ lib.optional (libglut != null) libglut; preConfigure = '' substituteInPlace src/Makefile.in \ diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 4f037f72a38c..1a1a7748957e 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -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 { pname = "crack-attack"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; 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" ]; enableParallelBuilding = true; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index a1322499ea6a..8e774a63ee54 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -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 , libXmu, libXext, libXt, libSM, libICE , libpng, pkg-config, gettext, intltool @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - libGLU libGL libX11 xorgproto tcl freeglut freetype + libGLU libGL libX11 xorgproto tcl libglut freetype sfml libXi libXmu libXext libXt libSM libICE libpng gettext diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 3f6b02ddbb98..e62cb158654b 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,5 +1,5 @@ { 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 , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew, curl @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; 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 libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase glew qtdeclarative curl diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 9e56ec4cfccd..6887b9650345 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, libGLU, libGL, SDL, freeglut, SDL_mixer, autoconf, automake, libtool +, libGLU, libGL, SDL, libglut, SDL_mixer, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ libGLU libGL SDL freeglut SDL_mixer libtool ]; + buildInputs = [ libGLU libGL SDL libglut SDL_mixer libtool ]; meta = with lib; { description = "Air combat simulator"; diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index a776a1b13dff..8ea4facb77b7 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: +{ stdenv, fetchFromGitHub, libX11, libglut, glew, libXNVCtrl, libXext, lib }: stdenv.mkDerivation rec { pname = "gl-gsync-demo"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; }; - buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + buildInputs = [ libX11 libglut glew libXNVCtrl libXext ]; installPhase = '' runHook preInstall diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index ed800f9afb06..c23a639cee10 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -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 , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools, wrapQtAppsHook @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6 fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_4 freeglut physfs + ffmpeg_4 libglut physfs qtbase ] ++ lib.optional withServer ghc; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU libglut physfs ]}" ]; meta = with lib; { diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix index d1e4bb03409d..b3c8fbf34a4b 100644 --- a/pkgs/games/methane/default.nix +++ b/pkgs/games/methane/default.nix @@ -7,7 +7,7 @@ , SDL2_mixer , fontconfig , freealut -, freeglut +, libglut , gettext , libGL , libGLU @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { SDL2_mixer fontconfig freealut - freeglut + libglut libGL libGLU openal diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index c9ed0ca0dbc5..62d553f402f6 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , makeWrapper -, freeglut +, libglut , libGLU , libGL }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ freeglut libGL libGLU ]; + buildInputs = [ libglut libGL libGLU ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp font24.raw $out/share 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 ":" ${libGL}/lib ''; diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index 4e3e044bbbfe..289959f92eac 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, libglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu libglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index bdfc68f837d1..f81c2f7f2f34 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -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, 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 ]; - 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 SDL2 SDL2_mixer enet libjpeg openscenegraph libvorbis curl ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a2157da80d6b..6e3cbefa64b8 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -162,7 +162,7 @@ in buildFHSEnv rec { gtk2 bzip2 flac - freeglut + libglut libjpeg libpng libpng12 diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 9c712ae41a43..46831a503324 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -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, libpng, zlib, makeWrapper }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; 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 ]; installTargets = "install datainstall"; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index a231d22d90f5..6691feeec6bb 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -13,7 +13,7 @@ , libgtop , boost179 , tinyxml -, freeglut +, libglut , libGLU , libGL , glee @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgtop boost179 tinyxml - freeglut + libglut libGLU libGL glee diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 211e03637d4e..9f3d22c8a707 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,5 +1,5 @@ { 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 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { 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 = [ "-D_INSTALL_PREFIX=${placeholder "out"}" diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6cb681e6fde2..4ca749f9a89b 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , 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 , python3, qtbase, qtsvg, boost , zlib, perl, curl @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ glm ] ++ lib.optionals stdenv.isLinux [ - freeglut libGLU libGL + libglut libGLU libGL ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d665c884751e..26645cea6a59 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchhg , autoreconfHook , boost -, freeglut +, libglut , glew , gsl , lcms2 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 660abc056ea9..3bbc20bc4cad 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, freeglut +, libglut , libGL , libGLU , libX11 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut libX11 libXext libGL diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 99debde345fe..ac41fd9c94f6 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { 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 , enableUnfree ? false, opencv2 }: @@ -35,7 +35,7 @@ mkDerivation rec { ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ - libGLU libGL freeglut + libGLU libGL libglut ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index 8cc125e47da9..69e5c44be69a 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , lib , cmake -, freeglut +, libglut , libGL , libGLU , libglvnd @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - freeglut + libglut libGL libGLU libglvnd diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 52941f7b96d7..790ef79ea09e 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, libGL, libGLU, freeglut, libX11 }: +, libGL, libGLU, libglut, libX11 }: stdenv.mkDerivation rec { pname = "twilight"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; }; - buildInputs = [ libGL libGLU freeglut libX11 ]; + buildInputs = [ libGL libGLU libglut libX11 ]; installPhase = '' install -Dm755 twilight $out/bin/twilight diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index eb8259929e82..d472727ce3ac 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libglut, libGL, libGLU }: stdenv.mkDerivation rec { pname = "hdaps-gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + buildInputs = [ libglut libGL libGLU ]; meta = with lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab6f385848ec..d8072b3f8c2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2864,7 +2864,7 @@ with pkgs; x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; + libglut = null; openal = null; }; @@ -36441,11 +36441,11 @@ with pkgs; construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; - freeglut = null; + libglut = null; }); construo = construoBase.override { - inherit libGL libGLU freeglut; + inherit libGL libGLU libglut; }; crack_attack = callPackage ../games/crack-attack { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5071fff62745..ddbf0b42fd61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19594,7 +19594,7 @@ with self; { }; # 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 ]; @@ -20301,7 +20301,7 @@ with self; { nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ - (with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); + (with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]); propagatedBuildInputs = [ AstroFITSHeader