From d1df0cd87370ce9d96fcff5c1a86dbe1e1882227 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 2 May 2015 12:26:50 +0200 Subject: [PATCH] chipmunk: 6.1.5 -> 7.0.0 --- .../libraries/chipmunk/default.nix | 52 ++++++++----------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 63c5959960a..52990097a23 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,39 +1,29 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - fullDepEntry = args.fullDepEntry; +{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto +, inputproto, libXi, libXmu +}: + +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 { - url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7"; + url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; + sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql"; }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"]; + buildInputs = + [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; - genMakefile = fullDepEntry '' - cmake -D CMAKE_INSTALL_PREFIX=$out . - '' ["minInit" "addInputs" "doUnpack"]; - - demoInstall = fullDepEntry('' + postInstall = '' mkdir -p $out/bin - cp Demo/chipmunk_demos $out/bin - '') ["doMakeInstall" "defEnsureDir"]; - - name = "chipmunk-" + version; - meta = { - description = "2D physics engine"; + cp demo/chipmunk_demos $out/bin + ''; + + meta = with stdenv.lib; { + description = "A fast and lightweight 2D game physics library"; + homepage = http://chipmunk2d.net/; + license = licenses.mit; + platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e86ed832d9..85bbae43123 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,8 +5521,7 @@ let check = callPackage ../development/libraries/check { }; - chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { - inherit cmake freeglut mesa; + chipmunk = callPackage ../development/libraries/chipmunk { inherit (xlibs) libX11 xproto inputproto libXi libXmu; };