commit 55fc8f879aa8716c9ddd5a2a15f40cfd08d23695
parent 34a78aeb0b17cefcf2fda93388177a043d048eb8
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 7 Oct 2023 01:03:51 +0400
Up
Diffstat:
23 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix
@@ -39,10 +39,10 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=missing-braces";
- cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
- KLOGG_USE_SENTRY = useSentry;
- KLOGG_USE_HYPERSCAN = useHyperscan;
- };
+ cmakeFlags = [
+ (lib.cmakeBool "KLOGG_USE_SENTRY" useSentry)
+ (lib.cmakeBool "KLOGG_USE_HYPERSCAN" useHyperscan)
+ ];
meta = with lib; {
description = "A fast, advanced log explorer based on glogg project";
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake gtest ];
- cmakeFlags = [ "-DMICROJSON_MAKE_TESTS=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "MICROJSON_MAKE_TESTS" true)
+ ];
doCheck = true;
diff --git a/pkgs/geospatial/ossim/default.nix b/pkgs/geospatial/ossim/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ geos jsoncpp libgeotiff libjpeg libtiff ];
cmakeFlags = [
- "-DBUILD_OSSIM_APPS=OFF"
- "-DBUILD_OSSIM_TESTS=OFF"
+ (lib.cmakeBool "BUILD_OSSIM_APPS" false)
+ (lib.cmakeBool "BUILD_OSSIM_TESTS" false)
];
meta = with lib; {
diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix
@@ -58,9 +58,9 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
- "-DQK_QT5_PORT=ON"
- "-DEXIF_LIBRARIES=${libexif}/lib/libexif.so"
- "-DEXIF_INCLUDE_DIRS=${libexif}/include"
+ (lib.cmakeBool "QK_QT5_PORT" true)
+ (lib.cmakeFeature "EXIF_LIBRARIES" "${libexif}/lib/libexif.so")
+ (lib.cmakeFeature "EXIF_INCLUDE_DIRS" "${libexif}/include")
];
postPatch = ''
diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ gnsstk ];
- cmakeFlags = [ "-DBUILD_EXT=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_EXT" true)
+ ];
meta = with lib; {
description = "GNSSTk applications suite";
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
- cmakeFlags = [ "-DBUILD_EXT=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_EXT" true)
+ ];
meta = with lib; {
description = "GNSSTk libraries";
diff --git a/pkgs/gpx/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
buildInputs = [ expat ];
cmakeFlags = [
- "-DBUILD_EXAMPLES=OFF"
- "-DBUILD_TESTS=OFF"
+ (lib.cmakeBool "BUILD_EXAMPLES" false)
+ (lib.cmakeBool "BUILD_TESTS" false)
];
doCheck = false;
diff --git a/pkgs/misc/bwh/default.nix b/pkgs/misc/bwh/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 the-foundation ] ++ lib.optional stdenv.isDarwin AppKit;
- #cmakeFlags = [ "-Dthe_Foundation_DIR=${the-foundation}/lib/cmake/the_Foundation" ];
+ #cmakeFlags = [
+ # (lib.cmakeFeature "the_Foundation_DIR" "${the-foundation}/lib/cmake/the_Foundation")
+ #];
meta = with lib; {
description = "Bitwise Harmony - simple synth tracker";
diff --git a/pkgs/misc/freeopcua/default.nix b/pkgs/misc/freeopcua/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ boost ];
- cmakeFlags = [ "-DSSL_SUPPORT_MBEDTLS=OFF" ];
+ cmakeFlags = [
+ (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false)
+ ];
meta = with lib; {
description = "Open Source C++ OPC-UA Server and Client Library";
diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix
@@ -27,7 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = "-fpermissive";
- cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" ];
+ cmakeFlags = [
+ (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
+ ];
installPhase = ''
install -Dm755 objlab -t $out/bin
diff --git a/pkgs/misc/ocelotgui/default.nix b/pkgs/misc/ocelotgui/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, desktopToDarwinBundle, mariadb-connector-c, wrapQtAppsHook }:
stdenv.mkDerivation (finalAttrs: {
- pname = "ocelotgui ";
- version = "2.0.0";
+ pname = "ocelotgui";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "ocelot-inc";
repo = "ocelotgui";
rev = finalAttrs.version;
- hash = "sha256-v8YMTc01bRDD5tqJIctTmtMkMD6+gh/CVKu/Vw9o7g0=";
+ hash = "sha256-CmLF8HrwdmWatFljSGLpy5YImlBGhjooB1K+axIDWhU=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ]
@@ -17,10 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ mariadb-connector-c ];
cmakeFlags = [
- "-DCMAKE_SKIP_RPATH=TRUE"
- "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb"
- "-DQT_VERSION=5"
- "-DOCELOT_THIRD_PARTY=0"
+ (lib.cmakeBool "CMAKE_SKIP_RPATH" true)
+ (lib.cmakeFeature "MYSQL_INCLUDE_DIR" "${mariadb-connector-c.dev}/include/mariadb")
+ (lib.cmakeFeature "QT_VERSION" "5")
+ (lib.cmakeFeature "OCELOT_THIRD_PARTY" "0")
];
env.NIX_LDFLAGS = "-L${mariadb-connector-c}/lib/mariadb -lmysqlclient";
@@ -31,5 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ mainProgram = "ocelotgui";
};
})
diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ boost gsl-lite gtest zlib ];
- cmakeFlags = [ "-DTELNETPP_WITH_ZLIB=True" ];
+ cmakeFlags = [
+ (lib.cmakeBool "TELNETPP_WITH_ZLIB" true)
+ ];
meta = with lib; {
description = "A C++ library for interacting with Telnet streams";
diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
tvision
];
- cmakeFlags = [ "-DTURBO_USE_SYSTEM_TVISION=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "TURBO_USE_SYSTEM_TVISION" true)
+ ];
meta = with lib; {
description = "An experimental text editor based on Scintilla and Turbo Vision";
diff --git a/pkgs/mqtt/influxdb-cxx/default.nix b/pkgs/mqtt/influxdb-cxx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals finalAttrs.doCheck [ catch2 trompeloeil ];
cmakeFlags = [
- "-DINFLUXCXX_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}"
+ (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck)
];
doCheck = false;
diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
bzip2 expat libosmium lua protozero zlib
];
- cmakeFlags = [ "-DBUILD_TESTS=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_TESTS" true)
+ ];
doCheck = true;
diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
zlib
];
- cmakeFlags = [ "-DBUILD_PLUGIN=OFF" ];
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_PLUGIN" false)
+ ];
meta = with lib; {
description = "OSM Database Replication Tools";
diff --git a/pkgs/radio/acarsdec/default.nix b/pkgs/radio/acarsdec/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ libacars libsndfile paho-mqtt-c rtl-sdr ];
- cmakeFlags = [ "-Drtl=ON" "-Dairspy=OFF" "-Dsdrplay=OFF" ];
+ cmakeFlags = [
+ (lib.cmakeBool "rtl" true)
+ (lib.cmakeBool "airspy" false)
+ (lib.cmakeBool "sdrplay" false)
+ ];
meta = with lib; {
description = "ACARS SDR decoder";
diff --git a/pkgs/radio/libacars/default.nix b/pkgs/radio/libacars/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ libxml2 zlib ];
- cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
+ cmakeFlags = [
+ (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+ ];
meta = with lib; {
description = "A library for decoding various ACARS message payloads";
diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ fftwFloat lame libconfig libshout pulseaudio rtl-sdr soapysdr ];
- cmakeFlags = [ "-DNFM=ON" ];
+ cmakeFlags = [
+ (lib.cmakeBool "NFM" true)
+ ];
meta = with lib; {
description = "Multichannel AM/NFM demodulator";
diff --git a/pkgs/suckless/poe/default.nix b/pkgs/suckless/poe/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
+ mainProgram = "poe";
};
})
diff --git a/pkgs/suckless/sled/default.nix b/pkgs/suckless/sled/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
+ mainProgram = "sled";
};
})
diff --git a/pkgs/suckless/ste/default.nix b/pkgs/suckless/ste/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
+ mainProgram = "ste";
};
})
diff --git a/pkgs/suckless/table/default.nix b/pkgs/suckless/table/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
+ mainProgram = "table";
};
})
