movit: move env variable(s) into env for structuredAttrs
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user