[Backport release-24.11] horizon-eda: fix build (#359670)

NixOS · Dec 1, 2024 · c341b29 · c341b29
2 parents 96b5000 + 5bea575
commit c341b29
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 30 deletions.
diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -1,21 +1,22 @@
-{ lib
-, cmake
-, cppzmq
-, curl
-, fetchFromGitHub
-, glm
-, gtkmm3
-, libarchive
-, libepoxy
-, libgit2
-, librsvg
-, libuuid
-, meson
-, ninja
-, opencascade-occt_7_6
-, pkg-config
-, podofo
-, sqlite
+{
+  lib,
+  cmake,
+  cppzmq,
+  curl,
+  fetchFromGitHub,
+  glm,
+  gtkmm3,
+  libarchive,
+  libepoxy,
+  libgit2,
+  librsvg,
+  libuuid,
+  meson,
+  ninja,
+  opencascade-occt_7_6,
+  pkg-config,
+  podofo,
+  sqlite,
 }:
 let
   opencascade-occt = opencascade-occt_7_6;
@@ -54,13 +55,22 @@ rec {
     sqlite
   ];
 
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-fpermissive"
+    ];
+  };
+
   CASROOT = opencascade-occt;
 
-  meta = with lib; {
+  meta = {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://horizon-eda.org";
-    maintainers = with maintainers; [ guserav jue89 ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      guserav
+      jue89
+    ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ho/horizon-eda/package.nix b/pkgs/by-name/ho/horizon-eda/package.nix
@@ -1,17 +1,25 @@
-{ stdenv
-, boost
-, callPackage
-, coreutils
-, libspnav
-, python3
-, wrapGAppsHook3
+{
+  stdenv,
+  boost,
+  callPackage,
+  coreutils,
+  libspnav,
+  python3,
+  wrapGAppsHook3,
 }:
 
 let
   base = callPackage ./base.nix { };
 in
 stdenv.mkDerivation rec {
-  inherit (base) pname version src meta CASROOT;
+  inherit (base)
+    pname
+    version
+    src
+    meta
+    CASROOT
+    env
+    ;
 
   # provide base for python module
   passthru = {