public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcad: 3.24.3.10 -> 3.25.0.0 

* update upstream version to 3.25.0.0
* fix the application desktop file to use the right binary name
* make building more robust when qt version changes, automatically try
  to copy qtscriptgenerator directory
This commit is contained in:
Yves Fischer 2020-08-25 23:00:03 +02:00
parent 5a5aab84df
commit 1f96216844
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/qcad/application-dir.patch
View File

@ -33,3 +33,16 @@ index c6c31cbf5..c51b59ce6 100644
} }
int RSettings::getSnapRange() { int RSettings::getSnapRange() {
diff --git a/qcad.desktop b/qcad.desktop
index 93c5e9720..2d0e6bf32 100644
--- a/qcad.desktop
+++ b/qcad.desktop
@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system
Comment[sl]=Sistem 2D CAD
Comment[uk]=2D САПР
Comment[tr]=2D CAD Sistemi
-Exec=qcad %F
+Exec=qcad-bin %F
X-MultipleArgs=true
Icon=qcad_icon
Terminal=false

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

@ -11,13 +11,13 @@
mkDerivationWith stdenv.mkDerivation rec { mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad"; pname = "qcad";
version = "3.24.3.10"; version = "3.25.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qcad"; owner = "qcad";
repo = "qcad"; repo = "qcad";
rev = "v${version}"; rev = "v${version}";
sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa"; sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc";
}; };
patches = [ patches = [
@ -25,11 +25,13 @@ mkDerivationWith stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then
cp \ mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}
src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \ cp \
src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.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
fi
'';
qmakeFlags = [ qmakeFlags = [
"MUPARSER_DIR=${muparser}" "MUPARSER_DIR=${muparser}"