diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-03-14 22:17:27 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-03-14 22:21:15 +0100 |
commit | 562f937d2123d98d200e8b62bc0c41a5c69843c6 (patch) | |
tree | e20e9a4f00f88ec36c2d20d8f2a9f5ff411ac11f /pkgs/applications/graphics/openscad | |
parent | 17b473449b48620ae9a31519f2fe5ad8a31320af (diff) | |
download | nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar.gz nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar.bz2 nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar.lz nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar.xz nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.tar.zst nixpkgs-562f937d2123d98d200e8b62bc0c41a5c69843c6.zip |
openscad: bump 2013.06 -> 2014.03
openscad now depends on glib, and it needs pkgconfig to find glib.
Diffstat (limited to 'pkgs/applications/graphics/openscad')
-rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index a1238fe3dcd..d831df5d7b6 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal -, mpfr, gmp +, mpfr, gmp, glib, pkgconfig }: stdenv.mkDerivation rec { - version = "2013.06"; + version = "2014.03"; name = "openscad-${version}"; src = fetchurl { - url = "https://openscad.googlecode.com/files/${name}.src.tar.gz"; - sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f"; + url = "http://files.openscad.org/${name}.src.tar.gz"; + sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6"; }; - buildInputs = [ qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr ]; + buildInputs = [ + qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig + ]; configurePhase = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " |