diff options
author | Ambroz Bizjak <ambrop7@gmail.com> | 2015-08-06 10:29:34 +0200 |
---|---|---|
committer | Ambroz Bizjak <ambrop7@gmail.com> | 2015-08-06 10:30:17 +0200 |
commit | ce322917169d03ac80bfcd0f60a4a6fed46c39a6 (patch) | |
tree | 73e085e46ba365e266adc80c9640d0d0538d4421 /pkgs/applications | |
parent | 980fee9fe0673a413553c2e2e7334e782bdca8de (diff) | |
download | nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar.gz nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar.bz2 nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar.lz nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar.xz nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.tar.zst nixlib-ce322917169d03ac80bfcd0f60a4a6fed46c39a6.zip |
openscad: 2014.03 -> 2015.03-1
- Added dependencies harfbuzz, qscintilla, gettext. - Removed redundant CFLAGS hack for eigen.
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} ''; |