diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-09-27 18:00:00 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-09-27 18:00:00 +0200 |
| commit | 8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2 (patch) | |
| tree | 07a24f51178a31d3a8b494a79716403251db7c29 /pkgs/applications/misc | |
| parent | bc571a7386d20d50f6a6a71c66598695237afacb (diff) | |
| parent | c564a122a65edafd67aa75625e04198fda45664f (diff) | |
Merge #255658: staging-next 2023-09-17
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/huggle/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/keyleds/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/opentrack/default.nix | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index a136f1f678ae1..3a6f25ede695d 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' ''; + cmakeBuildType = "None"; + cmakeFlags = [ "-S" "/build/source/src" - "-DCMAKE_BUILD_TYPE=None" "-DINSTALL_DATA_DIR=bin" "-DQT5_BUILD=ON" "-DWEB_ENGINE=ON" diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/applications/misc/keyleds/default.nix index c48b30b34dc90..a759b8e393e9b 100644 --- a/pkgs/applications/misc/keyleds/default.nix +++ b/pkgs/applications/misc/keyleds/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=MinSizeRel" - ]; + cmakeBuildType = "MinSizeRel"; meta = { homepage = "https://github.com/keyleds/keyleds"; diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index b4c455c0ce043..84edbc567b418 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -46,7 +46,6 @@ in dontWrapQtApps = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" ]; |