From ea72791b9bfe3303635484daa6f5bc772ce590f9 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Sat, 19 Sep 2020 21:48:24 +0200 Subject: [PATCH 1/2] qcad: 3.25.0.0 -> 3.25.2.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 26b6f3297644..0472a88c356b 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.25.0.0"; + version = "3.25.2.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; + sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; }; patches = [ From 2f934a967c67423d842c813ed5c1275e7a1e58d4 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Sat, 19 Sep 2020 21:48:38 +0200 Subject: [PATCH 2/2] qcad: fix library browser the drawing library of qcad uses qt's database abstract for sqlite. Somehow the libqsqlite library file is not found in the default location. As workaround it is copied to the qcad library directory. --- pkgs/applications/misc/qcad/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0472a88c356b..ad3c884f25e5 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -61,6 +61,10 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + # workaround to fix the library browser: + rm -r $out/lib/plugins/sqldrivers + ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg runHook postInstall