mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

treewide: remove CMAKE_BUILD_TYPE from cmakeFlags (#336854)

Browse source
This commit is contained in:
Peder Bergebakken Sundt 2024-09-19 22:32:31 +02:00 committed by GitHub
parent 47c3c65ae9 7194cfcbc6
commit 8aa42ae0d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 19 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
View file

@ -68,9 +68,7 @@ clangStdenv.mkDerivation rec {
zlib
];
cmakeFlags = lib.optionals debug [
"-DCMAKE_BUILD_TYPE=Debug"
];
cmakeBuildType = if debug then "Debug" else "Release";
postPatch = ''
substituteInPlace src/xmagics/executable.cpp \

1
pkgs/by-name/_2/_2ship2harkinian/package.nix
View file

@ -138,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "NON_PORTABLE" true)
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")

2
pkgs/by-name/cl/clang-uml/package.nix
View file

@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
yaml-cpp
];
cmakeFlags = if debug then [ "-DCMAKE_BUILD_TYPE=Debug" ] else [ ];
cmakeBuildType = if debug then "Debug" else "Release";
clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang;

2
pkgs/by-name/cr/cro-mag-rally/package.nix
View file

@ -26,8 +26,6 @@ stdenv.mkDerivation {
SDL2
];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
installPhase = ''
runHook preInstall
mkdir -p "$out/share/CroMagRally"

4
pkgs/by-name/ht/httping/package.nix
View file

@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
openssl
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
];
installPhase = ''
runHook preInstall
install -D httping $out/bin/httping

1
pkgs/by-name/li/libvpl/package.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DENABLE_DRI3=ON"
"-DENABLE_DRM=ON"
"-DENABLE_VA=ON"

2
pkgs/by-name/lm/lms/package.nix
View file

@ -60,8 +60,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
'';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
postInstall = ''
substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg"
substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources"

3
pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
View file

@ -54,9 +54,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
]
);
cmakeBuildType = "None";
cmakeFlags =
[
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
]
++ lib.optionals cudaSupport [

3
pkgs/by-name/ma/maa-assistant-arknights/package.nix
View file

@ -57,13 +57,14 @@ in
]
);
cmakeBuildType = "None";
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "INSTALL_FLATTEN" false)
(lib.cmakeBool "INSTALL_PYTHON" true)
(lib.cmakeBool "INSTALL_RESOURCE" true)
(lib.cmakeBool "USE_MAADEPS" false)
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
(lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
];

1
pkgs/by-name/ma/manifold/package.nix
View file

@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_SHARED_LIBS=ON"
"-DMANIFOLD_TEST=ON"
"-DMANIFOLD_CROSS_SECTION=ON"

4
pkgs/by-name/op/opengv/package.nix
View file

@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
eigen
];
cmakeFlakes = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
];
meta = {
description = "Collection of computer vision methods for solving geometric vision problems";
homepage = "https://github.com/laurentkneip/opengv";

19
pkgs/by-name/pr/protonmail-bridge-gui/package.nix
View file

@ -62,17 +62,14 @@ stdenv.mkDerivation (finalAttrs: {
sed -i "/add_subdirectory(bridge-gui-tester)/d" CMakeLists.txt
'';
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_BUILD_TYPE=Release"
"-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge"
"-DBRIDGE_VENDOR=Proton AG"
"-DBRIDGE_REVISION=${finalAttrs.src.rev}"
"-DBRIDGE_TAG=${finalAttrs.version}"
"-DBRIDGE_BUILD_ENV=Nix"
"-DBRIDGE_APP_VERSION=${finalAttrs.version}"
)
'';
cmakeFlags = [
"-DBRIDGE_APP_FULL_NAME=Proton Mail Bridge"
"-DBRIDGE_VENDOR=Proton AG"
"-DBRIDGE_REVISION=${finalAttrs.src.rev}"
"-DBRIDGE_TAG=${finalAttrs.version}"
"-DBRIDGE_BUILD_ENV=Nix"
"-DBRIDGE_APP_VERSION=${finalAttrs.version}"
];
installPhase = ''
runHook preInstall

3
pkgs/by-name/qd/qdiskinfo/package.nix
View file

@ -29,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
smartmontools
];
cmakeBuildType = "MinSizeRel";
cmakeFlags = [
"-DCMAKE_BUILD_TYPE:STRING=MinSizeRel"
"-DQT_VERSION_MAJOR=6"
];

1
pkgs/by-name/ra/raze/package.nix
View file

@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeBool "DYN_GTK" false)
(lib.cmakeBool "DYN_OPENAL" false)
];

3
pkgs/by-name/ri/ricochet-refresh/package.nix
View file

@ -44,9 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
cmakeBuildType = "MinSizeRel";
# https://github.com/blueprint-freespeech/ricochet-refresh/blob/main/BUILDING.md
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "MinSizeRel")
(lib.cmakeBool "RICOCHET_REFRESH_INSTALL_DESKTOP" true)
(lib.cmakeBool "USE_SUBMODULE_FMT" true)
];

2
pkgs/by-name/rs/rsgain/package.nix
View file

@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
hash = "sha256-kTvIMsRI99U2ovkN5pC4OUS/bJWpRYSuRcvObvQRnbQ=";
};
cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"];
nativeBuildInputs = [pkg-config cmake];
buildInputs = [libebur128 taglib ffmpeg inih fmt zlib];

2
pkgs/development/libraries/lensfun/default.nix
View file

@ -46,7 +46,7 @@ stdenv.mkDerivation {
buildInputs = [ glib zlib libpng ];
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" "-DCMAKE_BUILD_TYPE=RELEASE" ];
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
meta = with lib; {
platforms = platforms.linux ++ platforms.darwin;

1
pkgs/games/widelands/default.nix
View file

@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-Wno-dev" # dev warnings are only needed for upstream development
"-DCMAKE_BUILD_TYPE=Release"
"-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc.
"-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data
"-DWL_INSTALL_BINDIR=${placeholder "out"}/bin"