openscad: not using qt5 and libsForQt5 directly

Additional fix to #65522.
This commit is contained in:
Marek Mahut 2019-07-29 00:10:17 +02:00
parent 4ed879d97c
commit 71a76ff6a2
2 changed files with 31 additions and 8 deletions

View File

@ -1,7 +1,30 @@
{ stdenv, fetchFromGitHub, qt5, libsForQt5 { stdenv
, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , fetchFromGitHub
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig , qtbase
, double-conversion, lib3mf, libzip, mkDerivation , 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 { mkDerivation rec {
@ -15,14 +38,14 @@ mkDerivation rec {
sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l";
}; };
nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; nativeBuildInputs = [ bison flex pkgconfig gettext qmake ];
buildInputs = [ buildInputs = [
eigen boost glew opencsg cgal mpfr gmp glib eigen boost glew opencsg cgal mpfr gmp glib
harfbuzz lib3mf libzip double-conversion freetype fontconfig harfbuzz lib3mf libzip double-conversion freetype fontconfig
qtbase qtmultimedia qscintilla
] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined
++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) ++ stdenv.lib.optional stdenv.isDarwin qtmacextras
++ (with libsForQt5; [qscintilla])
; ;
qmakeFlags = [ "VERSION=${version}" ]; qmakeFlags = [ "VERSION=${version}" ];

View File

@ -19672,7 +19672,7 @@ in
openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
openscad = qt5.callPackage ../applications/graphics/openscad {}; openscad = libsForQt5.callPackage ../applications/graphics/openscad {};
opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};