philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

qcad: replace qt argument 

change qcad to take the individual packages instead of qt5 as argument
gstqt5
Yves Fischer 2020-09-20 17:24:42 +02:00
parent 4e7b124f13
commit a426157210
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/misc/qcad/default.nix
View File

@ -1,12 +1,16 @@
{ boost { boost
, fetchFromGitHub , fetchFromGitHub
, libGLU
, mkDerivationWith , mkDerivationWith
, muparser , muparser
, pkgconfig , pkgconfig
, qtbase
, qmake , qmake
, qt5 , qtscript
, qtsvg
, qtxmlpatterns
, qttools
, stdenv , stdenv
, libGLU
}: }:
mkDerivationWith stdenv.mkDerivation rec { mkDerivationWith stdenv.mkDerivation rec {
@ -25,11 +29,11 @@ mkDerivationWith stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then
mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}
cp \ cp \
src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ 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 fi
''; '';
@ -63,7 +67,7 @@ mkDerivationWith stdenv.mkDerivation rec {
# workaround to fix the library browser: # workaround to fix the library browser:
rm -r $out/lib/plugins/sqldrivers 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 install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
@ -74,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec {
boost boost
muparser muparser
libGLU libGLU
qt5.qtbase qtbase
qt5.qtscript qtscript
qt5.qtsvg qtsvg
qt5.qtxmlpatterns qtxmlpatterns
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
qt5.qmake qmake
qt5.qttools qttools
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -93,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec {
homepage = "https://qcad.org"; homepage = "https://qcad.org";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ yvesf ]; maintainers = with maintainers; [ yvesf ];
platforms = qt5.qtbase.meta.platforms; platforms = qtbase.meta.platforms;
}; };
} }