Skip to content

Commit 73d36c9

Browse files
committed
fix(node-opal-orchestra, nix): Enable node-type only on x86_64 builds
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
1 parent a4e8a82 commit 73d36c9

File tree

1 file changed

+49
-44
lines changed

1 file changed

+49
-44
lines changed

packaging/nix/villas.nix

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
withNodeMqtt ? withAllNodes,
3030
withNodeNanomsg ? withAllNodes,
3131
withNodeOpenDSS ? withAllNodes,
32-
withNodeOpalOrchestra ? withAllNodes,
32+
withNodeOpalOrchestra ? (withAllNodes && system == "x86_64-linux"),
3333
withNodeRedis ? withAllNodes,
3434
withNodeRtp ? withAllNodes,
3535
withNodeSocket ? withAllNodes,
@@ -142,50 +142,55 @@ stdenv.mkDerivation {
142142
protobufcBuildBuild
143143
];
144144

145-
buildInputs =
146-
[
147-
libwebsockets
148-
openssl
149-
curl
150-
spdlog
151-
bash
152-
]
153-
++ lib.optionals withExtraTesting [ criterion pcre2 libgit2 ]
154-
++ lib.optionals withExtraGraphviz [ graphviz ]
155-
++ lib.optionals withHookLua [ lua ]
156-
++ lib.optionals withNodeAmqp [ rabbitmq-c ]
157-
++ lib.optionals withNodeComedi [ comedilib ]
158-
++ lib.optionals withNodeEthercat [ ethercat ]
159-
++ lib.optionals withNodeIec60870 [ lib60870 ]
160-
++ lib.optionals withNodeIec61850 [ libiec61850 ]
161-
++ lib.optionals withNodeKafka [ rdkafka ]
162-
++ lib.optionals withNodeModbus [ libmodbus ]
163-
++ lib.optionals withNodeMqtt [ mosquitto ]
164-
++ lib.optionals withNodeNanomsg [ nanomsg ]
165-
++ lib.optionals withNodeOpenDSS [ opendssc ]
166-
++ lib.optionals withNodeOpalOrchestra [ orchestra libxml2 ]
167-
++ lib.optionals withNodeRedis [ redis-plus-plus ]
168-
++ lib.optionals withNodeRtp [ libre ]
169-
++ lib.optionals withNodeSocket [ libnl ]
170-
++ lib.optionals withNodeTemper [ libusb1 ]
171-
++ lib.optionals withNodeUldaq [ libuldaq ]
172-
++ lib.optionals withNodeWebrtc [ libdatachannel ]
173-
++ lib.optionals withNodeZeromq [
174-
czmq
175-
libsodium
176-
];
145+
buildInputs = [
146+
libwebsockets
147+
openssl
148+
curl
149+
spdlog
150+
bash
151+
]
152+
++ lib.optionals withExtraTesting [
153+
criterion
154+
pcre2
155+
libgit2
156+
]
157+
++ lib.optionals withExtraGraphviz [ graphviz ]
158+
++ lib.optionals withHookLua [ lua ]
159+
++ lib.optionals withNodeAmqp [ rabbitmq-c ]
160+
++ lib.optionals withNodeComedi [ comedilib ]
161+
++ lib.optionals withNodeEthercat [ ethercat ]
162+
++ lib.optionals withNodeIec60870 [ lib60870 ]
163+
++ lib.optionals withNodeIec61850 [ libiec61850 ]
164+
++ lib.optionals withNodeKafka [ rdkafka ]
165+
++ lib.optionals withNodeModbus [ libmodbus ]
166+
++ lib.optionals withNodeMqtt [ mosquitto ]
167+
++ lib.optionals withNodeNanomsg [ nanomsg ]
168+
++ lib.optionals withNodeOpenDSS [ opendssc ]
169+
++ lib.optionals withNodeOpalOrchestra [
170+
orchestra
171+
libxml2
172+
]
173+
++ lib.optionals withNodeRedis [ redis-plus-plus ]
174+
++ lib.optionals withNodeRtp [ libre ]
175+
++ lib.optionals withNodeSocket [ libnl ]
176+
++ lib.optionals withNodeTemper [ libusb1 ]
177+
++ lib.optionals withNodeUldaq [ libuldaq ]
178+
++ lib.optionals withNodeWebrtc [ libdatachannel ]
179+
++ lib.optionals withNodeZeromq [
180+
czmq
181+
libsodium
182+
];
177183

178-
propagatedBuildInputs =
179-
[
180-
libuuid
181-
jansson
182-
]
183-
++ lib.optionals withFormatProtobuf [
184-
protobuf
185-
protobufc
186-
]
187-
++ lib.optionals withNodeInfiniband [ rdma-core ]
188-
++ lib.optionals withExtraConfig [ libconfig ];
184+
propagatedBuildInputs = [
185+
libuuid
186+
jansson
187+
]
188+
++ lib.optionals withFormatProtobuf [
189+
protobuf
190+
protobufc
191+
]
192+
++ lib.optionals withNodeInfiniband [ rdma-core ]
193+
++ lib.optionals withExtraConfig [ libconfig ];
189194

190195
# TODO: Remove once pkgs.linuxHeaders has been upgrade to 6.14
191196
preBuild = ''

0 commit comments

Comments
 (0)