Compare commits
7 Commits
ec418a9f2f
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 16bc49faa1 | |||
| f1c528d719 | |||
| c4482e8cf1 | |||
| a84e963fad | |||
| 88a3362b58 | |||
| c449cc9902 | |||
| 071b532666 |
13
ethercat.nix
13
ethercat.nix
@@ -4,6 +4,8 @@
|
||||
stdenv,
|
||||
# interface name (eg. "eth0") or MAC address (eg. "e9:22:a4:62:74:23"). ff:ff:ff:ff:ff:ff means first available NIC
|
||||
master_device0 ? "ff:ff:ff:ff:ff:ff",
|
||||
enable-debug-if ? "no", # create debug interface for each master
|
||||
enable-eoe ? "yes", # eoe enable
|
||||
kernel
|
||||
}:
|
||||
|
||||
@@ -11,7 +13,7 @@
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
version="1.5";
|
||||
version="master-ba278192";
|
||||
device_modules="generic";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@@ -21,8 +23,8 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchGit {
|
||||
url = "https://gitlab.com/etherlab.org/ethercat.git";
|
||||
ref = "stable-${version}";
|
||||
rev = "c8a512ac077f2ab51bb072bfbef1a687f9f1c090";
|
||||
ref = "master";
|
||||
rev = "ba2781922162eca6c10c7cc72a7b4e52e3359f26";
|
||||
#ref = "refs/tags/1.9";
|
||||
#sha256 = lib.fakeSha256;
|
||||
};
|
||||
@@ -58,6 +60,9 @@ stdenv.mkDerivation {
|
||||
"--enable-tool"
|
||||
"--enable-userlib"
|
||||
"--enable-tty"
|
||||
"--enable-debug-if=${enable-debug-if}"
|
||||
"--enable-eoe=${enable-eoe}"
|
||||
"--enable-tty"
|
||||
"--with-linux-dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
#++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # TODO add flags for nongeneric NICs like this
|
||||
@@ -96,7 +101,7 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $out/bin/ethercatctl --replace 'MODPROBE=/sbin/modprobe' 'MODPROBE=modprobe'
|
||||
substituteInPlace $out/bin/ethercatctl --replace 'RMMOD=/sbin/rmmod' 'RMMOD=rmmod'
|
||||
substituteInPlace $out/bin/ethercatctl --replace 'MODINFO=/sbin/modinfo' 'MODINFO=modinfo'
|
||||
substituteInPlace $out/bin/ethercatctl --replace 'IP=/bin/ip' 'IP=ip'
|
||||
substituteInPlace $out/bin/ethercatctl --replace 'IP=/sbin/ip' 'IP=ip'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
13
flake.nix
13
flake.nix
@@ -10,8 +10,7 @@
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
kernel = pkgs.linux_latest;
|
||||
in
|
||||
{
|
||||
in rec {
|
||||
packages.default = pkgs.callPackage ./ethercat.nix { inherit kernel; };
|
||||
packages.ethercat = pkgs.callPackage ./ethercat.nix { inherit kernel; };
|
||||
packages.testmanager = pkgs.libsForQt5.callPackage ./testmanager.nix {};
|
||||
@@ -20,7 +19,15 @@
|
||||
packages.qtpdwidgets = pkgs.libsForQt5.callPackage ./qtpdwidgets.nix {};
|
||||
packages.pdcom = pkgs.callPackage ./pdcom.nix {};
|
||||
packages.pdserv = pkgs.callPackage ./pdserv.nix {};
|
||||
#overlays.ethercat = final: prev: { ethercat };
|
||||
overlay = final: prev: {
|
||||
ethercat = packages.ethercat;
|
||||
testmanager = packages.testmanager;
|
||||
dls = packages.dls;
|
||||
etherlab = packages.etherlab;
|
||||
qtpdwidgets = packages.qtpdwidgets;
|
||||
pdcom = packages.pdcom;
|
||||
pdserv = packages.pdserv;
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user