mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
qcad: 3.26.0.1 -> 3.26.1.0 (#118397)
This commit is contained in:
parent
0fcc3a1925
commit
8a17db4c8a
|
@ -10,18 +10,20 @@
|
||||||
, qtsvg
|
, qtsvg
|
||||||
, qtxmlpatterns
|
, qtxmlpatterns
|
||||||
, qttools
|
, qttools
|
||||||
, lib, stdenv
|
, lib
|
||||||
|
, stdenv
|
||||||
|
, installShellFiles
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivationWith stdenv.mkDerivation rec {
|
mkDerivationWith stdenv.mkDerivation rec {
|
||||||
pname = "qcad";
|
pname = "qcad";
|
||||||
version = "3.26.0.1";
|
version = "3.26.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qcad";
|
owner = "qcad";
|
||||||
repo = "qcad";
|
repo = "qcad";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
|
sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -36,7 +38,7 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||||
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-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
|
src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
"MUPARSER_DIR=${muparser}"
|
"MUPARSER_DIR=${muparser}"
|
||||||
|
@ -65,15 +67,27 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||||
cp -r scripts $out/lib
|
cp -r scripts $out/lib
|
||||||
cp -r plugins $out/lib/plugins
|
cp -r plugins $out/lib/plugins
|
||||||
cp -r patterns $out/lib/patterns
|
cp -r patterns $out/lib/patterns
|
||||||
|
cp -r fonts $out/lib/fonts
|
||||||
|
cp -r libraries $out/lib/libraries
|
||||||
|
cp -r linetypes $out/lib/linetypes
|
||||||
|
cp -r ts $out/lib/ts
|
||||||
|
|
||||||
# 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 ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
|
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
|
||||||
|
|
||||||
|
rm -r $out/lib/plugins/printsupport
|
||||||
|
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
|
||||||
|
|
||||||
|
rm -r $out/lib/plugins/imageformats
|
||||||
|
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
|
installManPage qcad.1
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
|
@ -89,6 +103,7 @@ mkDerivationWith stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
qmake
|
qmake
|
||||||
qttools
|
qttools
|
||||||
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue