diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-08-06 11:58:22 +0200 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-08-06 11:58:22 +0200 |
| commit | 2f97de9191b0989c33832a69d982bdee8111c7fc (patch) | |
| tree | 5627c5c0bae6746dad4524839ed4a4b8b96890c1 /pkgs/applications | |
| parent | 203e32e871346ad4a24cae9d9adfa60e0427a3cc (diff) | |
| parent | ce322917169d03ac80bfcd0f60a4a6fed46c39a6 (diff) | |
| download | nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar.gz nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar.bz2 nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar.lz nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar.xz nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.tar.zst nixlib-2f97de9191b0989c33832a69d982bdee8111c7fc.zip | |
Merge pull request #9144 from ambrop72/openscad-update
openscad: 2014.03 -> 2015.03-1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e6d5ee5528f0..7557e19896ff 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig +, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: stdenv.mkDerivation rec { - version = "2014.03"; + version = "2015.03-1"; name = "openscad-${version}"; src = fetchurl { url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6"; + sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279"; }; buildInputs = [ qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib - pkgconfig + pkgconfig harfbuzz qscintilla gettext ]; configurePhase = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " qmake PREFIX="$out" VERSION=${version} ''; |