Merge pull request #7662 from joachifm/chipmunk-7

chipmunk: 6.1.5 -> 7.0.0
This commit is contained in:
Pascal Wittmann 2015-05-02 22:42:41 +02:00
commit 2fee606d86
2 changed files with 22 additions and 33 deletions

View File

@ -1,39 +1,29 @@
args : { stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto
let , inputproto, libXi, libXmu
lib = args.lib; }:
fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry; stdenv.mkDerivation rec {
name = "chipmunk-${version}";
majorVersion = "7";
version = "${majorVersion}.0.0";
version = lib.attrByPath ["version"] "6.1.5" args;
majorVersion = lib.attrByPath ["majorVersion"] "6" args;
buildInputs = with args; [
cmake freeglut mesa
libX11 xproto inputproto libXi libXmu
];
in
rec {
src = fetchurl { src = fetchurl {
url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7"; sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql";
}; };
inherit buildInputs; buildInputs =
configureFlags = []; [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ];
/* doConfigure should be specified separately */
phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
genMakefile = fullDepEntry '' postInstall = ''
cmake -D CMAKE_INSTALL_PREFIX=$out .
'' ["minInit" "addInputs" "doUnpack"];
demoInstall = fullDepEntry(''
mkdir -p $out/bin mkdir -p $out/bin
cp Demo/chipmunk_demos $out/bin cp demo/chipmunk_demos $out/bin
'') ["doMakeInstall" "defEnsureDir"]; '';
name = "chipmunk-" + version; meta = with stdenv.lib; {
meta = { description = "A fast and lightweight 2D game physics library";
description = "2D physics engine"; homepage = http://chipmunk2d.net/;
license = licenses.mit;
platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work
}; };
} }

View File

@ -5627,8 +5627,7 @@ let
check = callPackage ../development/libraries/check { }; check = callPackage ../development/libraries/check { };
chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { chipmunk = callPackage ../development/libraries/chipmunk {
inherit cmake freeglut mesa;
inherit (xlibs) libX11 xproto inputproto libXi libXmu; inherit (xlibs) libX11 xproto inputproto libXi libXmu;
}; };