Merge pull request #199530 from NickCao/stellarium_11

stellarium: 1.0 -> 1.1

pkgs/applications/science/astronomy/calcmysky/default.nix

@@ -10,18 +10,20 @@
 
 stdenv.mkDerivation rec {
   pname = "calcmysky";
-  version = "0.1.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "10110111";
     repo = "CalcMySky";
     rev = "v${version}";
-    hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48=";
+    hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4=";
   };
 
   nativeBuildInputs = [ cmake wrapQtAppsHook ];
   buildInputs = [ glm eigen qtbase ];
 
+  cmakeFlags = [ "-DQT_VERSION=6" ];
+
   doCheck = true;
 
   meta = with lib;{

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
@@ -19,28 +21,30 @@
 
 stdenv.mkDerivation rec {
   pname = "stellarium";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${version}";
-    sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE=";
+    sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM=";
   };
 
   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/";

pkgs/development/libraries/qt-6/default.nix

@@ -17,6 +17,9 @@
 , writeText
 , gstreamer
 , gst-plugins-base
+, gst-plugins-good
+, gst-libav
+, gst-vaapi
 , gtk3
 , dconf
 , buildPackages
@@ -51,6 +54,7 @@ let
         inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
         patches = [
           ./patches/qtbase-qmake-pkg-config.patch
+          ./patches/qtbase-tzdir.patch
         ];
       };
 
@@ -66,7 +70,7 @@ let
       qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
       qtlottie = callPackage ./modules/qtlottie.nix { };
       qtmultimedia = callPackage ./modules/qtmultimedia.nix {
-        inherit gstreamer gst-plugins-base;
+        inherit gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
       };
       qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
       qtpositioning = callPackage ./modules/qtpositioning.nix { };

pkgs/development/libraries/qt-6/modules/qtmultimedia.nix

@@ -9,6 +9,9 @@
 , alsa-lib
 , gstreamer
 , gst-plugins-base
+, gst-plugins-good
+, gst-libav
+, gst-vaapi
 , libpulseaudio
 , wayland
 , elfutils
@@ -20,5 +23,6 @@ qtModule {
   pname = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ];
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gstreamer gst-plugins-base libpulseaudio elfutils libunwind alsa-lib wayland orc ];
+  buildInputs = [ libpulseaudio elfutils libunwind alsa-lib wayland orc ];
+  propagatedBuildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
 }

pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch

@@ -0,0 +1,48 @@
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
+index 627a4a81..a5f50acc 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
++++ b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
+ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
+ static QTzTimeZoneHash loadTzTimeZones()
+ {
+-    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
++    // Try TZDIR first, in case we're running on NixOS.
++    QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
++    // Fallback to traditional paths in case we are not on NixOS.
++    if (!QFile::exists(path))
++        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
+     if (!QFile::exists(path))
+         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
+ 
+@@ -727,18 +731,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
+         if (!tzif.open(QIODevice::ReadOnly))
+             return ret;
+     } else {
+-        // Open named tz, try modern path first, if fails try legacy path
+-        tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
++        // Try TZDIR first, in case we're running on NixOS
++        tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
+         if (!tzif.open(QIODevice::ReadOnly)) {
+-            tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
++            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
+             if (!tzif.open(QIODevice::ReadOnly)) {
+-                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
+-                auto check = validatePosixRule(ianaId);
+-                if (check.isValid) {
+-                    ret.m_hasDst = check.hasDst;
+-                    ret.m_posixRule = ianaId;
++                tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
++                if (!tzif.open(QIODevice::ReadOnly)) {
++                    // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
++                    auto check = validatePosixRule(ianaId);
++                    if (check.isValid) {
++                        ret.m_hasDst = check.hasDst;
++                        ret.m_posixRule = ianaId;
++                    }
++                    return ret;
+                 }
+-                return ret;
+             }
+         }
+     }

pkgs/top-level/all-packages.nix

@@ -21964,7 +21964,7 @@ with pkgs;
       inherit newScope;
       inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText;
       inherit bison cups dconf harfbuzz libGL perl gtk3 ninja;
-      inherit (gst_all_1) gstreamer gst-plugins-base;
+      inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
       inherit buildPackages;
       cmake = cmake.overrideAttrs (attrs: {
         patches = attrs.patches ++ [
@@ -27567,7 +27567,7 @@ with pkgs;
       inherit (gnome2) libglade;
   };
 
-  calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { };
+  calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
 
   calcurse = callPackage ../applications/misc/calcurse { };
 
@@ -36193,7 +36193,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 { };
 

pkgs/top-level/qt6-packages.nix

@@ -30,6 +30,8 @@ in
 
   quazip = callPackage ../development/libraries/quazip { };
 
+  qxlsx = callPackage ../development/libraries/qxlsx { };
+
   poppler = callPackage ../development/libraries/poppler {
     lcms = pkgs.lcms2;
     qt6Support = true;