From 6536fe5c55c2d023ce874e6a47e0f7ccf3c5f053 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 24 Mar 2025 11:43:47 +0100 Subject: [PATCH] stellarium: 24.4 -> 25.1 https://github.com/Stellarium/stellarium/releases/tag/v25.1 --- .../science/astronomy/stellarium/default.nix | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 1c41f924b898..2694f9ab05da 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, perl, wrapGAppsHook3, @@ -24,34 +23,33 @@ testers, xvfb-run, gitUpdater, + md4c, }: stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.4"; + version = "25.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; + hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs="; }; - patches = [ - # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 - (fetchpatch { - url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; - hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ - 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' - substituteInPlace src/CMakeLists.txt \ - --replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" - ''; + postPatch = + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'CPMAddPackage(NAME md4c' \ + 'CPMFindPackage(NAME md4c' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ + 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" + ''; nativeBuildInputs = [ cmake @@ -74,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { indilib libnova exiv2 + md4c nlopt ] ++ lib.optionals stdenv.hostPlatform.isLinux [