mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
nix: Replace our ethercat package which the one packaged in nixpkgs
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
parent
3f10581973
commit
151274c882
3 changed files with 3 additions and 61 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -1,29 +1,12 @@
|
|||
{
|
||||
"nodes": {
|
||||
"ethercat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1694079333,
|
||||
"narHash": "sha256-6F3zBhnU4CFpiO+Cnbd6ecUuiGH/KUntpPfuSYZ+rAI=",
|
||||
"owner": "etherlab.org",
|
||||
"repo": "ethercat",
|
||||
"rev": "722b2d607c4fc004ebf5204aaede0059c02274f4",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "etherlab.org",
|
||||
"ref": "stable-1.5",
|
||||
"repo": "ethercat",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1711370797,
|
||||
"narHash": "sha256-2xu0jVSjuKhN97dqc4bVtvEH52Rwh6+uyI1XCnzoUyI=",
|
||||
"lastModified": 1712666087,
|
||||
"narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c726225724e681b3626acc941c6f95d2b0602087",
|
||||
"rev": "a76c4553d7e741e17f289224eda135423de0491d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -35,7 +18,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"ethercat": "ethercat",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,11 +5,6 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
|
||||
ethercat = {
|
||||
url = "gitlab:etherlab.org/ethercat/stable-1.5";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
@ -85,10 +80,6 @@
|
|||
withAllHooks = true;
|
||||
withAllNodes = true;
|
||||
};
|
||||
|
||||
ethercat = pkgs.callPackage (nixDir + "/ethercat.nix") {
|
||||
src = inputs.ethercat;
|
||||
};
|
||||
};
|
||||
in {
|
||||
# Standard flake attribute for normal packages (not cross-compiled)
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2023 OPAL-RT Germany GmbH
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
{
|
||||
autoconf,
|
||||
automake,
|
||||
cmake,
|
||||
lib,
|
||||
libtool,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
src,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "ethercat";
|
||||
version = "villas";
|
||||
src = src;
|
||||
separateDebugInfo = true;
|
||||
nativeBuildInputs = [autoconf automake libtool pkg-config];
|
||||
preConfigure = ''
|
||||
bash ./bootstrap
|
||||
'';
|
||||
configureFlags = [
|
||||
"--enable-userlib=yes"
|
||||
"--enable-kernel=no"
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "IgH EtherCAT Master for Linux";
|
||||
homepage = "https://etherlab.org/master";
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
Loading…
Add table
Reference in a new issue