From cad95ac98ed8fb4367c5ab53b71d7b42e2d041c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Feb 2024 21:47:10 +0000 Subject: [PATCH 1/3] qcad: 3.29.3.1 -> 3.29.4.1 --- 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 9ab33ad29492..ea54dc325885 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.3.1"; + version = "3.29.4.1"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-QPBiEoOseNUzAWQHPEBq6O0jg8ed5dH+8xlyRCct0g4="; + sha256 = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; }; patches = [ From a9c165296baa748abd48d4a02e3dd84b8078d5b7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Feb 2024 09:15:01 +0100 Subject: [PATCH 2/3] qcad: minor syntax refactoring --- pkgs/applications/misc/qcad/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ea54dc325885..c733cb608388 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; + hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; }; patches = [ @@ -67,21 +67,20 @@ mkDerivation rec { "BOOST_DIR=${boost.dev}" ]; - qtWrapperArgs = - lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" ] - ++ - lib.optionals stdenv.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" + ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad '' + lib.optionalString stdenv.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib - '' + - '' + '' + '' install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary} @@ -121,11 +120,12 @@ mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "2D CAD package based on Qt"; homepage = "https://qcad.org"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ yvesf ]; + license = lib.licenses.gpl3Only; + mainProgram = "qcad"; + maintainers = with lib.maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; }; } From 833beecd8b1b730ff517a7dc6edbc5623e18e51c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Feb 2024 09:15:29 +0100 Subject: [PATCH 3/3] qcad: fix builds on Darwin --- pkgs/applications/misc/qcad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c733cb608388..e67a96fe7cd3 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { "MUPARSER_DIR=${muparser}" "INSTALLROOT=$(out)" "BOOST_DIR=${boost.dev}" + "QMAKE_CXXFLAGS=-std=c++14" ]; qtWrapperArgs = lib.optionals stdenv.isLinux [