diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:30:06 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:41 +0300 |
| commit | 0b6a6c903ea89e3883faca30c2a8b9cbef225505 (patch) | |
| tree | 14df725aea404c0d9d1572b638579d7d214a8572 /pkgs/applications/graphics/openscad | |
| parent | 2a7a4ec079405c01b0e504aaacff1cdd52637789 (diff) | |
| download | nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar.gz nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar.bz2 nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar.lz nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar.xz nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.tar.zst nixlib-0b6a6c903ea89e3883faca30c2a8b9cbef225505.zip | |
openscad: move to qmake4Hook
Diffstat (limited to 'pkgs/applications/graphics/openscad')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 7557e19896ff..f3b16a304608 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: @@ -12,13 +12,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib + qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib pkgconfig harfbuzz qscintilla gettext ]; - configurePhase = '' - qmake PREFIX="$out" VERSION=${version} - ''; + qmakeFlags = [ "VERSION=${version}" ]; doCheck = false; |