diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/pd-plugins/gem/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sndpeek/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/emulators/yabause/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/fluxus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/freepv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/opentoonz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/icesl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/lutris/fhsenv.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/mupdf/1.17/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/astronomy/celestia/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/geometry/antiprism/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/misc/boinc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/misc/foldingathome/viewer.nix | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 7bfdb1bd8a8a4..5cb308988a4f7 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 c65208343aff7..7cf8636ad1074 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 53fcc870f1a16..7623cc49efb9a 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 5491305fad2c8..cb32981aef0fc 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 def7e3e9dd867..1ff0fd5146df0 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 1dd460c2e1d2b..a474550820ba3 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 1a079ab8274c3..aeeb82ba581fb 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 acdbf8835e31f..6f9d023204012 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 b8cb75b057fd1..a3848ccc078b7 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 8b40196fdbff5..3347fa5356b5d 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 62ffc099dc6cd..eca8b6f5f2b8f 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 38caee5805b43..0edaa32babd70 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 68134a99a2035..199759437e911 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 7f28c8d1b1463..bb2c3c0abe30e 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 |