diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-13 16:24:05 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-13 16:24:05 +0400 |
| commit | a0ed4d2295f2c8d135780fba7b46a38d77500435 (patch) | |
| tree | a677b9916f3318b7a8dbcb35cba080eb0a335790 /pkgs/applications/graphics | |
| parent | 215c5f0ff8c0be3ffe268943b516cab66143febd (diff) | |
| download | nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar.gz nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar.bz2 nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar.lz nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar.xz nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.tar.zst nixlib-a0ed4d2295f2c8d135780fba7b46a38d77500435.zip | |
Updating OpenSCAD to use Eigen3
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index b09a38dcaa44..9343f3ec135d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,19 +1,24 @@ -{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp }: stdenv.mkDerivation rec { - version = "2011.12"; + version = "git-20121213"; name = "openscad-${version}"; - src = fetchurl { - url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; - sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; - }; + # src = fetchurl { + # url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; + # sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; + # }; + src = fetchgit { + url = "https://github.com/openscad/openscad.git"; + rev = "c0612a9ed0899c96963e04c848a59b0164a689a2"; + sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2"; + }; buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr]; configurePhase = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 " + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " qmake PREFIX="$out" ''; |