stellarium: migrate to pkgs/by-name

This commit is contained in:
magicquark
2025-10-26 22:34:16 +00:00
parent ae2f6f2c74
commit ce0937bc1d
2 changed files with 14 additions and 24 deletions

View File

@@ -6,19 +6,11 @@
cmake, cmake,
perl, perl,
wrapGAppsHook3, wrapGAppsHook3,
wrapQtAppsHook, qt6,
qtbase, qt6Packages,
qtcharts,
qtpositioning,
qtmultimedia,
qtserialport,
qtwayland,
qtwebengine,
calcmysky, calcmysky,
qxlsx,
indilib, indilib,
libnova, libnova,
qttools,
exiv2, exiv2,
nlopt, nlopt,
testers, testers,
@@ -50,26 +42,26 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
substituteInPlace src/CMakeLists.txt \ substituteInPlace src/CMakeLists.txt \
--replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" --replace-fail "\''${_qt_bin_dir}/../" "${qt6.qtmultimedia}/lib/qt-6/"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
perl perl
wrapGAppsHook3 wrapGAppsHook3
wrapQtAppsHook qt6.wrapQtAppsHook
qttools qt6.qttools
]; ];
buildInputs = [ buildInputs = [
qtbase qt6.qtbase
qtcharts qt6.qtcharts
qtpositioning qt6.qtpositioning
qtmultimedia qt6.qtmultimedia
qtserialport qt6.qtserialport
qtwebengine qt6.qtwebengine
calcmysky calcmysky
qxlsx qt6Packages.qxlsx
indilib indilib
libnova libnova
exiv2 exiv2
@@ -77,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
nlopt nlopt
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
qtwayland qt6.qtwayland
]; ];
preConfigure = '' preConfigure = ''
@@ -88,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
# fatal error: 'QtSerialPort/QSerialPortInfo' file not found # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qt6.qtserialport}/lib";
dontWrapGApps = true; dontWrapGApps = true;

View File

@@ -14232,8 +14232,6 @@ with pkgs;
spyder = with python3.pkgs; toPythonApplication spyder; spyder = with python3.pkgs; toPythonApplication spyder;
stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
tulip = libsForQt5.callPackage ../applications/science/misc/tulip { tulip = libsForQt5.callPackage ../applications/science/misc/tulip {
python3 = python312; # fails to build otherwise python3 = python312; # fails to build otherwise
}; };