cmake: 3.25.3 -> 3.26.4
This commit is contained in:
parent
733c1988b7
commit
b8ac5b6cfb
1 changed files with 12 additions and 12 deletions
|
@ -35,16 +35,16 @@ in
|
||||||
assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == [];
|
assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == [];
|
||||||
# Minimal, bootstrap cmake does not have toolkits
|
# Minimal, bootstrap cmake does not have toolkits
|
||||||
assert isBootstrap -> (uiToolkits == []);
|
assert isBootstrap -> (uiToolkits == []);
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "cmake"
|
pname = "cmake"
|
||||||
+ lib.optionalString isBootstrap "-boot"
|
+ lib.optionalString isBootstrap "-boot"
|
||||||
+ lib.optionalString cursesUI "-cursesUI"
|
+ lib.optionalString cursesUI "-cursesUI"
|
||||||
+ lib.optionalString qt5UI "-qt5UI";
|
+ lib.optionalString qt5UI "-qt5UI";
|
||||||
version = "3.25.3";
|
version = "3.26.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
|
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
|
||||||
sha256 = "sha256-zJlXAdWQym3rxCRemYmTkJnKUoJ91GtdNZLwk6/hkBw=";
|
hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
|
|
||||||
nativeBuildInputs = setupHooks ++ [
|
nativeBuildInputs = finalAttrs.setupHooks ++ [
|
||||||
pkg-config
|
pkg-config
|
||||||
]
|
]
|
||||||
++ lib.optionals buildDocs [ texinfo ]
|
++ lib.optionals buildDocs [ texinfo ]
|
||||||
|
@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"CXXFLAGS=-Wno-elaborated-enum-base"
|
"CXXFLAGS=-Wno-elaborated-enum-base"
|
||||||
"--docdir=share/doc/${pname}${version}"
|
"--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}"
|
||||||
] ++ (if useSharedLibraries
|
] ++ (if useSharedLibraries
|
||||||
then [ "--no-system-jsoncpp" "--system-libs" ]
|
then [ "--no-system-jsoncpp" "--system-libs" ]
|
||||||
else [ "--no-system-libs" ]) # FIXME: cleanup
|
else [ "--no-system-libs" ]) # FIXME: cleanup
|
||||||
|
@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
doCheck = false; # fails
|
doCheck = false; # fails
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://cmake.org/";
|
homepage = "https://cmake.org/";
|
||||||
description = "Cross-platform, open-source build system generator";
|
description = "Cross-platform, open-source build system generator";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
@ -164,10 +164,10 @@ stdenv.mkDerivation rec {
|
||||||
configuration files, and generate native makefiles and workspaces that can
|
configuration files, and generate native makefiles and workspaces that can
|
||||||
be used in the compiler environment of your choice.
|
be used in the compiler environment of your choice.
|
||||||
'';
|
'';
|
||||||
changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html";
|
changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html";
|
||||||
license = licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with maintainers; [ ttuegel lnl7 AndersonTorres ];
|
maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ];
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
broken = (qt5UI && stdenv.isDarwin);
|
broken = (qt5UI && stdenv.isDarwin);
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
Loading…
Reference in a new issue