Merge pull request #20745 from rardiol/allegro5

Allegro5

pkgs/development/libraries/allegro/5-unstable.nix

···
-{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
-, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
-, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
-, inputproto, libXi, fixesproto, libXfixes }:
-
-stdenv.mkDerivation rec {
-  name = "allegro-${version}";
-  version = "5.1.11";
-
-  src = fetchurl {
-    url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz";
-    sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
-  };
-
-  buildInputs = [
-    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
-    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
-    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
-    kbproto libjpeg flac inputproto libXi fixesproto libXfixes
-  ];
-
-  patchPhase = ''
-    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
-  '';
-
-  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
-
-  meta = with stdenv.lib; {
-    description = "A game programming library";
-    homepage = http://liballeg.org/;
-    license = licenses.zlib;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-  };
-}

pkgs/development/libraries/allegro/5.nix

···
 { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
 , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }:
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
+, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora
+, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
+, libXdmcp
+}:
 
 stdenv.mkDerivation rec {
   name = "allegro-${version}";
-  version = "5.0.11";
+  version = "5.2.1.1";
 
   src = fetchurl {
     url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
-    sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
+    sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm";
   };
 
   buildInputs = [
···
     alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
     xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
     kbproto libjpeg flac
+    inputproto libXi fixesproto libXfixes
+    enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
+    libpulseaudio libpthreadstubs
   ];
+
+  patchPhase = ''
+    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
+  '';
 
   cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
 

pkgs/top-level/all-packages.nix

···
 
   allegro = callPackage ../development/libraries/allegro {};
   allegro5 = callPackage ../development/libraries/allegro/5.nix {};
-  allegro5unstable = callPackage
-    ../development/libraries/allegro/5-unstable.nix {};
 
   amrnb = callPackage ../development/libraries/amrnb { };