Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #9144 from ambrop72/openscad-update

openscad: 2014.03 -> 2015.03-1

lethalman 2f97de91 203e32e8

+4 -5
+4 -5
pkgs/applications/graphics/openscad/default.nix
··· 1 1 { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal 2 - , mpfr, gmp, glib, pkgconfig 2 + , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 - version = "2014.03"; 6 + version = "2015.03-1"; 7 7 name = "openscad-${version}"; 8 8 9 9 src = fetchurl { 10 10 url = "http://files.openscad.org/${name}.src.tar.gz"; 11 - sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6"; 11 + sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279"; 12 12 }; 13 13 14 14 buildInputs = [ 15 15 qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib 16 - pkgconfig 16 + pkgconfig harfbuzz qscintilla gettext 17 17 ]; 18 18 19 19 configurePhase = '' 20 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " 21 20 qmake PREFIX="$out" VERSION=${version} 22 21 ''; 23 22