mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 10:50:15 +00:00
cmake: enable structuredAttrs
This commit is contained in:
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
|
||||
--subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
|
||||
# CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
|
||||
configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags $cmakeFlags"
|
||||
configureFlags=("--parallel=''${NIX_BUILD_CORES:-1}" "CC=$CC_FOR_BUILD" "CXX=$CXX_FOR_BUILD" ''${configureFlags[@]} ''${cmakeFlags[@]})
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isStatic && useSharedLibraries) ''
|
||||
# FindLibArchive ignores libarchive.pc's Libs.private
|
||||
@@ -211,6 +211,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ignoredVersions = "-"; # -rc1 and friends
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://cmake.org/";
|
||||
description = "Cross-platform, open-source build system generator";
|
||||
|
||||
Reference in New Issue
Block a user