diff options
| author | Yves Fischer <yvesf+git@xapek.org> | 2020-08-25 23:00:03 +0200 |
|---|---|---|
| committer | Yves Fischer <yvesf+git@xapek.org> | 2020-09-01 09:26:46 +0200 |
| commit | 1f96216844b817c37d9df987cd07669e929ecb6c (patch) | |
| tree | fd10b7ea75a1474f811d9aa00bfbbb3f9f9a5ad4 /pkgs/applications/misc/qcad | |
| parent | 5a5aab84df4af619df7fc36336c0ef2c6d700ec2 (diff) | |
| download | nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar.gz nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar.bz2 nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar.lz nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar.xz nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.tar.zst nixpkgs-1f96216844b817c37d9df987cd07669e929ecb6c.zip | |
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
Diffstat (limited to 'pkgs/applications/misc/qcad')
| -rw-r--r-- | pkgs/applications/misc/qcad/application-dir.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/misc/qcad/default.nix | 16 |
2 files changed, 22 insertions, 7 deletions
diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch index 84782e1e717..0b8a29319eb 100644 --- a/pkgs/applications/misc/qcad/application-dir.patch +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -33,3 +33,16 @@ index c6c31cbf5..c51b59ce6 100644 } 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 diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0079cd220bd..26b6f329764 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -11,13 +11,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.24.3.10"; + version = "3.25.0.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa"; + sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; }; patches = [ @@ -25,11 +25,13 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} - cp \ - src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro - ''; + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.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 + fi + ''; qmakeFlags = [ "MUPARSER_DIR=${muparser}" |