diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-07-29 00:10:17 +0200 |
|---|---|---|
| committer | Marek Mahut <marek.mahut@gmail.com> | 2019-07-29 08:00:19 +0200 |
| commit | 71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6 (patch) | |
| tree | 150bf0848cae0fb68dfda4834636a75e6c60f4a0 /pkgs/applications/graphics | |
| parent | 4ed879d97c1e7e7730bb17d32d605710d5704457 (diff) | |
| download | nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar.gz nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar.bz2 nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar.lz nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar.xz nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.tar.zst nixlib-71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6.zip | |
openscad: not using qt5 and libsForQt5 directly
Additional fix to #65522.
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e074721b365d..9f7fbc8421ba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,7 +1,30 @@ -{ stdenv, fetchFromGitHub, qt5, libsForQt5 -, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig -, double-conversion, lib3mf, libzip, mkDerivation +{ stdenv +, fetchFromGitHub +, qtbase +, qtmultimedia +, qscintilla +, bison +, flex +, eigen +, boost +, libGLU_combined +, glew +, opencsg +, cgal +, mpfr +, gmp +, glib +, pkgconfig +, harfbuzz +, gettext +, freetype +, fontconfig +, double-conversion +, lib3mf +, libzip +, mkDerivation +, qtmacextras +, qmake }: mkDerivation rec { @@ -15,14 +38,14 @@ mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; + nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig + qtbase qtmultimedia qscintilla ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined - ++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) - ++ (with libsForQt5; [qscintilla]) + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras ; qmakeFlags = [ "VERSION=${version}" ]; |