movit: move env variable(s) into env for structuredAttrs

This commit is contained in:
Stefan Frijters
2026-02-14 12:25:16 +01:00
parent 2944f0d37c
commit f7cd173302
+9 -9
View File
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
"dev"
];
GTEST_DIR = "${gtest.src}/googletest";
nativeBuildInputs = [
pkg-config
];
@@ -45,13 +43,15 @@ stdenv.mkDerivation rec {
libepoxy
];
env =
lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest
}
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_LDFLAGS = "-framework OpenGL";
};
env = {
GTEST_DIR = "${gtest.src}/googletest";
}
// lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest
}
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_LDFLAGS = "-framework OpenGL";
};
enableParallelBuilding = true;