cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qcad: replace qt argument

Browse source 
change qcad to take the individual packages instead of qt5 as argument
This commit is contained in:
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
, 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;
};
}