pyrox.dev / nixpkgs
lol
fork atom

librecad: 2.2.0-rc1 -> 2.2.0-rc2

authored by

Jonathan Baldwin and committed by
tomberek 4ce3e862 efb1815d

+5 -63
unified split
+5 -27
pkgs/applications/misc/librecad/default.nix
··· 1 1 { lib 2 2 , boost 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , installShellFiles 6 5 , mkDerivationWith 7 6 , muparser ··· 11 10 , qtsvg 12 11 , qttools 13 12 , runtimeShell 14 - , gcc8Stdenv 13 + , stdenv 15 14 }: 16 15 17 - let 18 - stdenv = gcc8Stdenv; 19 - in 20 - 21 - # Doesn't build with gcc9 22 16 mkDerivationWith stdenv.mkDerivation rec { 23 17 pname = "librecad"; 24 - version = "2.2.0-rc1"; 18 + version = "2.2.0-rc2"; 25 19 26 20 src = fetchFromGitHub { 27 21 owner = "LibreCAD"; 28 22 repo = "LibreCAD"; 29 23 rev = version; 30 - sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; 24 + sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; 31 25 }; 32 26 33 - patches = [ 34 - ./fix_qt_5_11_build.patch 35 - ( 36 - fetchpatch { 37 - # Fix missing app name and icon on Wayland. 38 - url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch"; 39 - sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5"; 40 - } 41 - ) 42 - ]; 43 - 44 27 postPatch = '' 45 28 substituteInPlace scripts/postprocess-unix.sh \ 46 29 --replace /bin/sh ${runtimeShell} ··· 88 71 qttools 89 72 ]; 90 73 91 - enableParallelBuilding = true; 92 - 93 74 meta = with lib; { 94 75 description = "2D CAD package based on Qt"; 95 76 homepage = "https://librecad.org"; 96 - license = licenses.gpl2; 97 - maintainers = with maintainers; [ 98 - kiwi 99 - viric 100 - ]; 77 + license = licenses.gpl2Only; 78 + maintainers = with maintainers; [ kiwi viric ]; 101 79 platforms = platforms.linux; 102 80 }; 103 81 }
-36
pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
··· 1 - diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp 2 - index 835e47d..2c878e8 100644 3 - --- a/librecad/src/ui/forms/qg_commandwidget.cpp 4 - +++ b/librecad/src/ui/forms/qg_commandwidget.cpp 5 - @@ -27,6 +27,7 @@ 6 - 7 - #include <algorithm> 8 - 9 - +#include <QAction> 10 - #include <QKeyEvent> 11 - #include <QFileDialog> 12 - #include <QSettings> 13 - diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp 14 - index 2beaceb..84068ad 100644 15 - --- a/librecad/src/ui/generic/colorwizard.cpp 16 - +++ b/librecad/src/ui/generic/colorwizard.cpp 17 - @@ -27,6 +27,7 @@ 18 - #include "colorwizard.h" 19 - #include "ui_colorwizard.h" 20 - 21 - +#include <QAction> 22 - #include <QColorDialog> 23 - #include <QLineEdit> 24 - #include <QListWidget> 25 - diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp 26 - index 7c35144..0e394f2 100644 27 - --- a/librecad/src/ui/generic/widgetcreator.cpp 28 - +++ b/librecad/src/ui/generic/widgetcreator.cpp 29 - @@ -27,6 +27,7 @@ 30 - #include "widgetcreator.h" 31 - #include "ui_widgetcreator.h" 32 - 33 - +#include <QActionGroup> 34 - #include <QSettings> 35 - #include <QLineEdit> 36 - #include <QPushButton>