From e7486a5d189bfc7ce48d0cd2217d8f695be3b028 Mon Sep 17 00:00:00 2001
From: Nicolas Hiillos <nicolashiillos@gmail.com>
Date: Tue, 24 Oct 2023 16:55:45 +0300
Subject: [PATCH] Add override

---
 modules/linuxcnc.nix                   | 5 ++++-
 packages/linuxcnc-ethercat/default.nix | 5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/linuxcnc.nix b/modules/linuxcnc.nix
index 953c7de..f9933d7 100644
--- a/modules/linuxcnc.nix
+++ b/modules/linuxcnc.nix
@@ -2,9 +2,12 @@
 let
   cfg = config.local.packages.linuxcnc;
   inherit (builtins) filter map pathExists listToAttrs;
+  linuxcncWithEC = pkgs.linuxcnc.overrideAttrs (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.linuxcnc-ethercat pkgs.hal-cia402 ];
+  });
   linuxcncEnv = pkgs.buildEnv {
     name = "linuxcnc-env";
-    paths = with pkgs; [ linuxcnc hal-cia402 linuxcnc-ethercat ];
+    paths = with pkgs; [ linuxcncWithEC hal-cia402 linuxcnc-ethercat ];
   };
 in {
   options.local.packages.linuxcnc.enable = lib.mkEnableOption "Enable linuxcnc";
diff --git a/packages/linuxcnc-ethercat/default.nix b/packages/linuxcnc-ethercat/default.nix
index 6d68dda..605fccd 100644
--- a/packages/linuxcnc-ethercat/default.nix
+++ b/packages/linuxcnc-ethercat/default.nix
@@ -14,17 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = with pkgs; [
-    autoPatchelfHook
     which
     expat
   ];
 
   buildInputs = [ linuxcnc ethercat ];
 
-  preBuild = ''
-    #addAutoPatchelfSearchPath ${placeholder "out"}/lib/linuxcnc/modules/
-  '';
-
   installFlags = [
     "prefix=${placeholder "out"}"
     #"RUN_IN_PLACE=YES"