Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

nix: Replace our ethercat package which the one packaged in nixpkgs

Browse source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel 2024-04-09 23:48:40 +02:00
parent 3f10581973
commit 9da93eafed
3 changed files with 3 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -1,29 +1,12 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711370797, "lastModified": 1712666087,
"narHash": "sha256-2xu0jVSjuKhN97dqc4bVtvEH52Rwh6+uyI1XCnzoUyI=", "narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c726225724e681b3626acc941c6f95d2b0602087", "rev": "a76c4553d7e741e17f289224eda135423de0491d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,7 +18,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"ethercat": "ethercat",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

9
flake.nix
View file

@ -5,11 +5,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
ethercat = {
url = "gitlab:etherlab.org/ethercat/stable-1.5";
flake = false;
};
}; };
outputs = { outputs = {
@ -85,10 +80,6 @@
withAllHooks = true; withAllHooks = true;
withAllNodes = true; withAllNodes = true;
}; };
ethercat = pkgs.callPackage (nixDir + "/ethercat.nix") {
src = inputs.ethercat;
};
}; };
in { in {
# Standard flake attribute for normal packages (not cross-compiled) # Standard flake attribute for normal packages (not cross-compiled)

31
packaging/nix/ethercat.nix
View file

@ -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;
};
}