diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 142dafe38eb1..0df0f86ef456 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,8 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell -, qtbase, qtsvg, qttools, qmake -, boost, muparser }: +{ boost +, fetchFromGitHub +, installShellFiles +, mkDerivationWith +, muparser +, pkgconfig +, qmake +, qtbase +, qtsvg +, qttools +, runtimeShell +, gcc8Stdenv +}: -mkDerivation rec { +let + stdenv = gcc8Stdenv; +in + +# Doesn't build with gcc9 +mkDerivationWith stdenv.mkDerivation rec { pname = "librecad"; version = "2.2.0-rc1"; @@ -13,7 +28,9 @@ mkDerivation rec { sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; }; - patches = [ ./fix_qt_5_11_build.patch ]; + patches = [ + ./fix_qt_5_11_build.patch + ]; postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ @@ -48,17 +65,30 @@ mkDerivation rec { runHook postInstall ''; - buildInputs = [ boost muparser qtbase qtsvg ]; + buildInputs = [ + boost + muparser + qtbase + qtsvg + ]; - nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ]; + nativeBuildInputs = [ + installShellFiles + pkgconfig + qmake + qttools + ]; enableParallelBuilding = true; - meta = with lib; { + meta = with stdenv.lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ + kiwi + viric + ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5042a17c8463..e7e7be157006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23709,8 +23709,8 @@ in bftools = callPackage ../applications/science/biology/bftools { }; - blast = callPackage ../applications/science/biology/blast { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + blast = callPackage ../applications/science/biology/blast { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; cd-hit = callPackage ../applications/science/biology/cd-hit { };