tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #77348 from Kiwi/fix-librecad

librecad: fix build

authored by

worldofpeace and committed by
GitHub ed165adb 2b7f4edd

+41 -11
unified split
+39 -9
pkgs/applications/misc/librecad/default.nix
··· 1 - { mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell 2 - , qtbase, qtsvg, qttools, qmake 3 - , boost, muparser }: 1 + { boost 2 + , fetchFromGitHub 3 + , installShellFiles 4 + , mkDerivationWith 5 + , muparser 6 + , pkgconfig 7 + , qmake 8 + , qtbase 9 + , qtsvg 10 + , qttools 11 + , runtimeShell 12 + , gcc8Stdenv 13 + }: 4 14 5 - mkDerivation rec { 15 + let 16 + stdenv = gcc8Stdenv; 17 + in 18 + 19 + # Doesn't build with gcc9 20 + mkDerivationWith stdenv.mkDerivation rec { 6 21 pname = "librecad"; 7 22 version = "2.2.0-rc1"; 8 23 ··· 13 28 sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; 14 29 }; 15 30 16 - patches = [ ./fix_qt_5_11_build.patch ]; 31 + patches = [ 32 + ./fix_qt_5_11_build.patch 33 + ]; 17 34 18 35 postPatch = '' 19 36 substituteInPlace scripts/postprocess-unix.sh \ ··· 48 65 runHook postInstall 49 66 ''; 50 67 51 - buildInputs = [ boost muparser qtbase qtsvg ]; 68 + buildInputs = [ 69 + boost 70 + muparser 71 + qtbase 72 + qtsvg 73 + ]; 52 74 53 - nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ]; 75 + nativeBuildInputs = [ 76 + installShellFiles 77 + pkgconfig 78 + qmake 79 + qttools 80 + ]; 54 81 55 82 enableParallelBuilding = true; 56 83 57 - meta = with lib; { 84 + meta = with stdenv.lib; { 58 85 description = "2D CAD package based on Qt"; 59 86 homepage = "https://librecad.org"; 60 87 license = licenses.gpl2; 61 - maintainers = with maintainers; [ viric ]; 88 + maintainers = with maintainers; [ 89 + kiwi 90 + viric 91 + ]; 62 92 platforms = platforms.linux; 63 93 }; 64 94 }
+2 -2
pkgs/top-level/all-packages.nix
··· 23709 23709 23710 23710 bftools = callPackage ../applications/science/biology/bftools { }; 23711 23711 23712 - blast = callPackage ../applications/science/biology/blast { 23713 - inherit (darwin.apple_sdk.frameworks) ApplicationServices; 23712 + blast = callPackage ../applications/science/biology/blast { 23713 + inherit (darwin.apple_sdk.frameworks) ApplicationServices; 23714 23714 }; 23715 23715 23716 23716 cd-hit = callPackage ../applications/science/biology/cd-hit { };