diff options
author | Yves Fischer <yvesf+git@xapek.org> | 2020-09-20 17:24:42 +0200 |
---|---|---|
committer | Yves Fischer <yvesf+git@xapek.org> | 2020-09-20 17:24:42 +0200 |
commit | a426157210bf42c72909c48bda7ec65e1b8c0799 (patch) | |
tree | 8376d01f101c2bb75a48b8620fd94671daec0508 | |
parent | 4e7b124f1311e1fa90ccd3b270d62dd9986f23d9 (diff) | |
download | nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar.gz nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar.bz2 nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar.lz nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar.xz nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.tar.zst nixpkgs-a426157210bf42c72909c48bda7ec65e1b8c0799.zip |
qcad: replace qt argument
change qcad to take the individual packages instead of qt5 as argument
-rw-r--r-- | pkgs/applications/misc/qcad/default.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ad3c884f25e..a0d370c00ac 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -1,12 +1,16 @@ { boost , fetchFromGitHub +, libGLU , mkDerivationWith , muparser , pkgconfig +, qtbase , qmake -, qt5 +, qtscript +, qtsvg +, qtxmlpatterns +, qttools , stdenv -, libGLU }: mkDerivationWith stdenv.mkDerivation rec { @@ -25,11 +29,11 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} cp \ src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro + src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro fi ''; @@ -63,7 +67,7 @@ mkDerivationWith stdenv.mkDerivation rec { # workaround to fix the library browser: rm -r $out/lib/plugins/sqldrivers - ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg @@ -74,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec { boost muparser libGLU - qt5.qtbase - qt5.qtscript - qt5.qtsvg - qt5.qtxmlpatterns + qtbase + qtscript + qtsvg + qtxmlpatterns ]; nativeBuildInputs = [ pkgconfig - qt5.qmake - qt5.qttools + qmake + qttools ]; enableParallelBuilding = true; @@ -93,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec { homepage = "https://qcad.org"; license = licenses.gpl3; maintainers = with maintainers; [ yvesf ]; - platforms = qt5.qtbase.meta.platforms; + platforms = qtbase.meta.platforms; }; } |