diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 00:17:18 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 00:17:18 +0000 |
| commit | a9da9ae89d2c397b2000403db211262f773d27e2 (patch) | |
| tree | 421f31c5d427326e7c67a7860bd3b8d1f7903632 /pkgs/development/libraries | |
| parent | 03aae985bc8430e06c0d41d055fab359a689bfca (diff) | |
| parent | 1d9c2ff41365c388fe04b2b206bd1057b3ce60ec (diff) | |
| download | nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar.gz nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar.bz2 nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar.lz nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar.xz nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.tar.zst nixlib-a9da9ae89d2c397b2000403db211262f773d27e2.zip | |
Merge nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=29488
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 66 insertions, 3 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 8e8854e25bc8..deedbdfc751f 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -35,5 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "SDL image library"; + homepage = http://www.libsdl.org/projects/SDL_image/; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix new file mode 100644 index 000000000000..2bfc57011fdf --- /dev/null +++ b/pkgs/development/libraries/allegro/5.nix @@ -0,0 +1,61 @@ + +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa + , kbproto + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="allegro"; + version="5.0.4"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + 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 = [ + ]; + + meta = { + description = "A game programming library"; + license = "free-noncopyleft"; # giftware + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/alleg/files/"; + }; + }; +}) x + diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 019455ae142b..75842bee9f8f 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -16,7 +16,7 @@ let version="4.4.2"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${name}.tar.gz"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; in diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index c420d2677705..cef5347e758f 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.2.2"; - sha256 = "bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd"; + version = "0.2.2.1"; + sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da"; isLibrary = true; isExecutable = true; buildDepends = [ |