diff options
author | Robert Helgesson <robert@rycee.net> | 2015-12-29 23:34:19 +0100 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2015-12-30 21:15:15 +0100 |
commit | f37279aebc9a0fa6a60727cb410a9d2d7655a4ab (patch) | |
tree | 941d685ac41fc79d479e69a16a11fe0d6ac38199 /pkgs/development/libraries/allegro | |
parent | bbd253b569bf0ada40e4b177c22568086a82165f (diff) |
allegro5: use stdenv
This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
Diffstat (limited to 'pkgs/development/libraries/allegro')
-rw-r--r-- | pkgs/development/libraries/allegro/5.nix | 69 | ||||
-rw-r--r-- | pkgs/development/libraries/allegro/5.upstream | 7 |
2 files changed, 22 insertions, 54 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 793b57c676b5..6f05afa4f480 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,56 +1,31 @@ +{ 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 }: -x@{builderDefsPackage - , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor - , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc - , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , kbproto, libjpeg, flac - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +stdenv.mkDerivation rec { + name = "allegro-${version}"; + version = "5.0.11"; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="allegro"; - version = "5.0.11"; - name="${baseName}-${version}"; - project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; + src = fetchurl { + url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doCmake" "doMakeInstall"]; - - doCmake = a.fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" - cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . - '') ["minInit" "doUnpack" "addInputs"]; - - makeFlags = [ + 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 ]; - meta = { + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; + + meta = with stdenv.lib; { description = "A game programming library"; - license = a.lib.licenses.free; # giftware - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - inherit version; + homepage = http://liballeg.org/; + license = licenses.zlib; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; -}) x +} diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream deleted file mode 100644 index 9d139383fe3d..000000000000 --- a/pkgs/development/libraries/allegro/5.upstream +++ /dev/null @@ -1,7 +0,0 @@ -attribute_name allegro5 -url http://alleg.sourceforge.net/download.html -version_link '[.]tar[.].*/download$' -SF_redirect -do_overwrite () { - do_overwrite_just_version -} |