From 94ad1c37a84a2065fe30470125d577aa5e3b3994 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 23 Jun 2024 14:46:14 -0400 Subject: [PATCH] prismlauncher: use `lib.cmakeFeature` --- .../by-name/pr/prismlauncher-unwrapped/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 2e8b7efef878..2a0850069317 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -74,18 +74,20 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # downstream branding - "-DLauncher_BUILD_PLATFORM=nixpkgs" + (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") + ] + ++ lib.optionals (msaClientID != null) [ + (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID)) ] - ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [ - "-DLauncher_QT_VERSION_MAJOR=5" + (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5") ] ++ lib.optionals stdenv.isDarwin [ # we wrap our binary manually - "-DINSTALL_BUNDLE=nodeps" + (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps") # disable built-in updater - "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/Applications/" + (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''") + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") ]; dontWrapQtApps = true;