summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/allegro
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-11-10 16:44:34 +0000
committeradisbladis <adisbladis@gmail.com>2019-11-18 20:10:43 +0000
commitc9d8624ccddf17aee28745446b6763aabb26b4c7 (patch)
treee7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/development/libraries/allegro
parente6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff)
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/allegro')
-rw-r--r--pkgs/development/libraries/allegro/5.nix4
-rw-r--r--pkgs/development/libraries/allegro/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index b267c62d6c70..5f5368f2866d 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
-, libXxf86vm, openal, libGLU_combined, libjpeg, flac
+, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
, libXi, libXfixes, freetype, libopus, libtheora
, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
, libXdmcp
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
- libXxf86vm openal libGLU_combined
+ libXxf86vm openal libGLU libGL
libjpeg flac
libXi libXfixes
enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 6b44ec1b598a..64488b25b094 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
-, libXxf86vm, openal, libGLU_combined }:
+, libXxf86vm, openal, libGLU, libGL }:
stdenv.mkDerivation rec {
pname = "allegro";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
- libXxf86vm openal libGLU_combined
+ libXxf86vm openal libGLU libGL
];
hardeningDisable = [ "format" ];