From 868537eb53087f084dc2fee052945bfe29a0eb51 Mon Sep 17 00:00:00 2001 From: Nicolas Hiillos Date: Wed, 16 Aug 2023 10:01:26 +0300 Subject: [PATCH] Import ethercat from git repo --- default.nix | 2 ++ flake.nix | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index f571c44..00d27b8 100644 --- a/default.nix +++ b/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { pname = "ec-controller"; version = "0.1.0"; + src = ./.; + nativeBuildInputs = [ cmake ]; buildInputs = [ ethercat ]; diff --git a/flake.nix b/flake.nix index 46d7ab7..d86c506 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,17 @@ etherlab.url = "git+https://git.dripco.eu/nic/etherlab-nix"; }; outputs = { self, nixpkgs, flake-utils, etherlab, ... }: - flake-utils.lib.eachDefaultSystem (system: { - packages.ec-controller = (import ./default.nix) { ethercat = etherlab.ethercat; }; - defaultPackage.default = (import ./default.nix) { ethercat = etherlab.ethercat; }; - }); + flake-utils.lib.eachSystem [ + "x86_64-linux" "i686-linux" "aarch64-linux" + ] (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + kernel = pkgs.linux_latest; + ethercat = etherlab.packages.${system}.ethercat; + in + { + packages.default = pkgs.callPackage ./default.nix { inherit ethercat; }; + packages.ec-controller = pkgs.callPackage ./default.nix { inherit ethercat; }; + } + ); }