@@ -1,12 +1,16 @@
11{ boost
22, fetchFromGitHub
3+, libGLU
34, mkDerivationWith
45, muparser
56, pkgconfig
7+, qtbase
68, qmake
7−, qt5
9+, qtscript
10+, qtsvg
11+, qtxmlpatterns
12+, qttools
813, stdenv
9−, libGLU
1014}:
1115
1216mkDerivationWith stdenv.mkDerivation rec {
@@ -25,11 +29,11 @@ mkDerivationWith stdenv.mkDerivation rec {
2529 ];
2630
2731 postPatch = ''
28− if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then
29− mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}
32+ if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then
33+ mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}
3034 cp \
3135 src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \
32− src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro
36+ src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
3337 fi
3438 '';
3539
@@ -63,7 +67,7 @@ mkDerivationWith stdenv.mkDerivation rec {
6367
6468 # workaround to fix the library browser:
6569 rm -r $out/lib/plugins/sqldrivers
66− ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers
70+ ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
6771
6872 install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
6973
@@ -74,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec {
7478 boost
7579 muparser
7680 libGLU
77− qt5.qtbase
78− qt5.qtscript
79− qt5.qtsvg
80− qt5.qtxmlpatterns
81+ qtbase
82+ qtscript
83+ qtsvg
84+ qtxmlpatterns
8185 ];
8286
8387 nativeBuildInputs = [
8488 pkgconfig
85− qt5.qmake
86− qt5.qttools
89+ qmake
90+ qttools
8791 ];
8892
8993 enableParallelBuilding = true;
@@ -93,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec {
9397 homepage = "https://qcad.org";
9498 license = licenses.gpl3;
9599 maintainers = with maintainers; [ yvesf ];
96− platforms = qt5.qtbase.meta.platforms;
100+ platforms = qtbase.meta.platforms;
97101 };
98102}