From 99522fb742eef35264c0ecb05fd3019bfcc30901 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:18:35 -0200 Subject: [PATCH 1/2] allegro5: 5.0.11 -> 5.2.11 --- pkgs/development/libraries/allegro/5.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 6f05afa4f48..7efccfad243 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,15 +1,19 @@ { 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 = [ @@ -17,8 +21,15 @@ stdenv.mkDerivation rec { 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" ]; meta = with stdenv.lib; { From ec74f36ccc25526f551bdbb66b20a8046865c156 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 26 Nov 2016 17:19:07 -0200 Subject: [PATCH 2/2] allegro5unstable: removed --- .../libraries/allegro/5-unstable.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/allegro/5-unstable.nix diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix deleted file mode 100644 index e5a2c38ddab..00000000000 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd483d4777..c3c66181140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6477,8 +6477,6 @@ in 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 { };