librepcb-unstable: init at 2017-12-29 (#33630)
This commit is contained in:
parent
2f6b88551b
commit
e056315a3e
@ -389,6 +389,7 @@
|
|||||||
lufia = "Kyohei Kadota <lufia@lufia.org>";
|
lufia = "Kyohei Kadota <lufia@lufia.org>";
|
||||||
luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
|
luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
|
||||||
lukego = "Luke Gorrie <luke@snabb.co>";
|
lukego = "Luke Gorrie <luke@snabb.co>";
|
||||||
|
luz = "Luz <luz666@daum.net>";
|
||||||
lw = "Sergey Sofeychuk <lw@fmap.me>";
|
lw = "Sergey Sofeychuk <lw@fmap.me>";
|
||||||
lyt = "Tim Liou <wheatdoge@gmail.com>";
|
lyt = "Tim Liou <wheatdoge@gmail.com>";
|
||||||
m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
|
m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
|
||||||
|
33
pkgs/applications/science/electronics/librepcb/default.nix
Normal file
33
pkgs/applications/science/electronics/librepcb/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, mesa, openssl, zlib }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "librepcb-${version}";
|
||||||
|
version = "20171229";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "LibrePCB";
|
||||||
|
repo = "LibrePCB";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
rev = "4efb06fa42755abc5e606da4669cc17e8de2f8c6";
|
||||||
|
sha256 = "0r33fm1djqpy0dzvnf5gv2dfh5nj2acaxb7w4cn8yxdgrazjf7ak";
|
||||||
|
};
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ qmake qttools ];
|
||||||
|
|
||||||
|
buildInputs = [ qtbase ];
|
||||||
|
|
||||||
|
# LibrePCB still supports QT below 5.9. But some code lines break the build, so they are removed by this patch so that the software builds.
|
||||||
|
patches = [ ./fix-2017-12.patch ];
|
||||||
|
|
||||||
|
qmakeFlags = ["-r"];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "A free EDA software to develop printed circuit boards";
|
||||||
|
homepage = http://librepcb.org/;
|
||||||
|
maintainers = with maintainers; [ luz ];
|
||||||
|
license = licenses.gpl3;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
--- a/libs/librepcb/common/fileio/serializableobjectlist.h
|
||||||
|
+++ b/libs/librepcb/common/fileio/serializableobjectlist.h
|
||||||
|
@@ -374,26 +374,6 @@
|
||||||
|
} // namespace librepcb
|
||||||
|
|
||||||
|
/*****************************************************************************************
|
||||||
|
- * Prevent from using SerializableObjectList in a foreach loop because it always would
|
||||||
|
- * create a deep copy of the list! You should use C++11 range based for loops instead.
|
||||||
|
- ****************************************************************************************/
|
||||||
|
-
|
||||||
|
-#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 0))
|
||||||
|
-#define QFOREACHCONTAINER_TEMPLATE QtPrivate::QForeachContainer
|
||||||
|
-#else
|
||||||
|
-#define QFOREACHCONTAINER_TEMPLATE QForeachContainer
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-template <typename T, typename P>
|
||||||
|
-class QFOREACHCONTAINER_TEMPLATE<librepcb::SerializableObjectList<T, P>> { public:
|
||||||
|
- ~QForeachContainer() = delete;
|
||||||
|
-};
|
||||||
|
-template <typename T, typename P>
|
||||||
|
-class QFOREACHCONTAINER_TEMPLATE<const librepcb::SerializableObjectList<T, P>> { public:
|
||||||
|
- ~QForeachContainer() = delete;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-/*****************************************************************************************
|
||||||
|
* End of File
|
||||||
|
****************************************************************************************/
|
||||||
|
|
@ -19179,6 +19179,8 @@ with pkgs;
|
|||||||
boost = boost160;
|
boost = boost160;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { };
|
||||||
|
|
||||||
ngspice = callPackage ../applications/science/electronics/ngspice { };
|
ngspice = callPackage ../applications/science/electronics/ngspice { };
|
||||||
|
|
||||||
pcb = callPackage ../applications/science/electronics/pcb { };
|
pcb = callPackage ../applications/science/electronics/pcb { };
|
||||||
|
Loading…
Reference in New Issue
Block a user