diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/electronics')
4 files changed, 76 insertions, 54 deletions
diff --git a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix new file mode 100644 index 000000000000..8ce75a6ce241 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -0,0 +1,58 @@ +{ lib +, cppzmq +, curl +, fetchFromGitHub +, glm +, gtkmm3 +, libarchive +, libepoxy +, libgit2 +, librsvg +, libuuid +, opencascade-occt +, pkg-config +, podofo +, sqlite +}: + +# This base is used in horizon-eda and python3Packages.horizon-eda +rec { + pname = "horizon-eda"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "horizon-eda"; + repo = "horizon"; + rev = "v${version}"; + hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cppzmq + curl + glm + gtkmm3 + libarchive + libepoxy + libgit2 + librsvg + libuuid + opencascade-occt + podofo + sqlite + ]; + + CASROOT = opencascade-occt; + + meta = with lib; { + description = "A free EDA software to develop printed circuit boards"; + homepage = "https://horizon-eda.org"; + maintainers = with maintainers; [ guserav jue89 ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index c4c1e798dd51..1fbc92f06115 100644 --- a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -1,62 +1,33 @@ { stdenv , boost +, callPackage , coreutils -, cppzmq -, curl -, libepoxy -, fetchFromGitHub -, glm -, gtkmm3 -, lib -, libarchive -, libgit2 -, librsvg , libspnav -, libuuid -, opencascade-occt -, pkg-config -, podofo , python3 -, sqlite , wrapGAppsHook }: +let + base = callPackage ./base.nix { }; +in stdenv.mkDerivation rec { - pname = "horizon-eda"; - version = "2.5.0"; + inherit (base) pname version src meta CASROOT; - src = fetchFromGitHub { - owner = "horizon-eda"; - repo = "horizon"; - rev = "v${version}"; - sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + # provide base for python module + passthru = { + inherit base; }; - buildInputs = [ - cppzmq - curl - libepoxy - glm - gtkmm3 - libarchive - libgit2 - librsvg + buildInputs = base.buildInputs ++ [ libspnav - libuuid - opencascade-occt - podofo - python3 - sqlite ]; - nativeBuildInputs = [ + nativeBuildInputs = base.nativeBuildInputs ++ [ boost.dev - pkg-config wrapGAppsHook + python3 ]; - CASROOT = opencascade-occt; - installFlags = [ "INSTALL=${coreutils}/bin/install" "DESTDIR=$(out)" @@ -64,12 +35,4 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - - meta = with lib; { - description = "A free EDA software to develop printed circuit boards"; - homepage = "https://horizon-eda.org"; - maintainers = with maintainers; [ guserav ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index bd824ac28889..dfd679d4d531 100644 --- a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,21 +1,22 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, cmake, wrapQtAppsHook +, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, libSM, freeimage, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; + sha256 = "sha256-2o2Gue/RnDWxe8jk/Ehx9CM+B3ac5rEQn0H7yodUEZ8="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook qtquickcontrols2 opencascade-occt libGLU ]; buildInputs = [ qtbase ]; + propagatedBuildInputs = [ libSM freeimage ]; meta = with lib; { description = "A free EDA software to develop printed circuit boards"; diff --git a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 94e0741f79a5..dc4991bf480b 100644 --- a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; + hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA="; }; nativeBuildInputs = [ |