From c29a74bc7e8f99a0179bce6623be433913da705b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 9 Feb 2026 22:27:36 +0100 Subject: [PATCH] tiscamera: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ti/tiscamera/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix index ba2ccf7016f0..1d7856dd6fc3 100644 --- a/pkgs/by-name/ti/tiscamera/package.nix +++ b/pkgs/by-name/ti/tiscamera/package.nix @@ -112,19 +112,24 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; - env.CXXFLAGS = "-include cstdint"; - doCheck = true; # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression. checkPhase = "ctest --force-new-ctest-process -E gstreamer"; - # wrapGAppsHook3: make sure we add ourselves to the introspection - # and gstreamer paths. - GI_TYPELIB_PATH = "${placeholder "out"}/lib/girepository-1.0"; - GST_PLUGIN_SYSTEM_PATH_1_0 = "${placeholder "out"}/lib/gstreamer-1.0"; + env = { + # wrapGAppsHook3: make sure we add ourselves to the introspection + # and gstreamer paths. + GI_TYPELIB_PATH = "${placeholder "out"}/lib/girepository-1.0"; + GST_PLUGIN_SYSTEM_PATH_1_0 = "${placeholder "out"}/lib/gstreamer-1.0"; - QT_PLUGIN_PATH = lib.optionalString withGui "${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"; + QT_PLUGIN_PATH = lib.optionalString withGui "${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"; + + CXXFLAGS = toString [ + "-include" + "cstdint" + ]; + }; dontWrapQtApps = true;