From e562fc6e0535d85fcbb681d506a3a3cb3366213e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 5 Nov 2022 00:52:11 +0800 Subject: [PATCH] stellarium: build with qt6 --- .../science/astronomy/stellarium/default.nix | 18 ++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 37d5a15f7ac6..1b0f5abdf98b 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -3,13 +3,15 @@ , fetchFromGitHub , cmake , perl +, wrapGAppsHook , wrapQtAppsHook , qtbase , qtcharts -, qtlocation +, qtpositioning , qtmultimedia -, qtscript , qtserialport +, qttranslations +, qtwayland , qtwebengine , calcmysky , qxlsx @@ -31,16 +33,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl + wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ qtbase qtcharts - qtlocation + qtpositioning qtmultimedia - qtscript qtserialport + qttranslations + qtwayland qtwebengine calcmysky qxlsx @@ -54,6 +58,12 @@ stdenv.mkDerivation rec { 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' ''; + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = "https://stellarium.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73918b3dfd6c..46ccb5c00df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36139,7 +36139,7 @@ with pkgs; sq = callPackage ../development/tools/sq { }; - stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { }; stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };