librecad: fix build
recently this stopped building on nixos-unstable
a git bisect of nixpkgs revealed;
`# first bad commit: [8f729c0070
] gcc: switch default to gcc9`
this switches the build to use gcc8Stdenv
This commit is contained in:
parent
568fd9c191
commit
e0f6da5655
@ -1,8 +1,23 @@
|
|||||||
{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
|
{ boost
|
||||||
, qtbase, qtsvg, qttools, qmake
|
, fetchFromGitHub
|
||||||
, boost, muparser }:
|
, 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";
|
pname = "librecad";
|
||||||
version = "2.2.0-rc1";
|
version = "2.2.0-rc1";
|
||||||
|
|
||||||
@ -13,7 +28,9 @@ mkDerivation rec {
|
|||||||
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
|
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fix_qt_5_11_build.patch ];
|
patches = [
|
||||||
|
./fix_qt_5_11_build.patch
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace scripts/postprocess-unix.sh \
|
substituteInPlace scripts/postprocess-unix.sh \
|
||||||
@ -48,17 +65,30 @@ mkDerivation rec {
|
|||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ boost muparser qtbase qtsvg ];
|
buildInputs = [
|
||||||
|
boost
|
||||||
|
muparser
|
||||||
|
qtbase
|
||||||
|
qtsvg
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
|
nativeBuildInputs = [
|
||||||
|
installShellFiles
|
||||||
|
pkgconfig
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "2D CAD package based on Qt";
|
description = "2D CAD package based on Qt";
|
||||||
homepage = "https://librecad.org";
|
homepage = "https://librecad.org";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ viric ];
|
maintainers = with maintainers; [
|
||||||
|
kiwi
|
||||||
|
viric
|
||||||
|
];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user