From e8ad4159f11d3890b17b3df0aa7401974fb78d8a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 12 Feb 2026 11:16:28 +0100 Subject: [PATCH] ardour: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ar/ardour/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index 9f7f7be04f7d..1a2e14771506 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -192,14 +192,17 @@ stdenv.mkDerivation ( ] ++ lib.optional optimize "--optimize"; - env.NIX_CFLAGS_COMPILE = toString [ - # 'ioprio_set' syscall support: - "-D_GNU_SOURCE" - # compiler doesn't find headers without these: - "-I${lib.getDev serd}/include/serd-0" - "-I${lib.getDev sratom}/include/sratom-0" - "-I${lib.getDev sord}/include/sord-0" - ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + # 'ioprio_set' syscall support: + "-D_GNU_SOURCE" + # compiler doesn't find headers without these: + "-I${lib.getDev serd}/include/serd-0" + "-I${lib.getDev sratom}/include/sratom-0" + "-I${lib.getDev sord}/include/sord-0" + ]; + LINKFLAGS = "-lpthread"; + }; postInstall = '' # wscript does not install these for some reason @@ -227,8 +230,6 @@ stdenv.mkDerivation ( }" ''; - LINKFLAGS = "-lpthread"; - meta = { description = "Multi-track hard disk recording software"; longDescription = ''