stellarium: 24.4 -> 25.1 (#392677)

authored by Peder Bergebakken Sundt and committed by GitHub 4a0b66d1 a7f55cc9

+17 -18
+17 -18
pkgs/applications/science/astronomy/stellarium/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - fetchpatch, 6 5 cmake, 7 6 perl, 8 7 wrapGAppsHook3, ··· 24 23 testers, 25 24 xvfb-run, 26 25 gitUpdater, 26 + md4c, 27 27 }: 28 28 29 29 stdenv.mkDerivation (finalAttrs: { 30 30 pname = "stellarium"; 31 - version = "24.4"; 31 + version = "25.1"; 32 32 33 33 src = fetchFromGitHub { 34 34 owner = "Stellarium"; 35 35 repo = "stellarium"; 36 36 rev = "v${finalAttrs.version}"; 37 - hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; 37 + hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs="; 38 38 }; 39 39 40 - patches = [ 41 - # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 42 - (fetchpatch { 43 - url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; 44 - hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; 45 - }) 46 - ]; 47 - 48 - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' 49 - substituteInPlace CMakeLists.txt \ 50 - --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 51 - 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' 52 - substituteInPlace src/CMakeLists.txt \ 53 - --replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" 54 - ''; 40 + postPatch = 41 + '' 42 + substituteInPlace CMakeLists.txt \ 43 + --replace-fail 'CPMAddPackage(NAME md4c' \ 44 + 'CPMFindPackage(NAME md4c' 45 + '' 46 + + lib.optionalString stdenv.hostPlatform.isDarwin '' 47 + substituteInPlace CMakeLists.txt \ 48 + --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 49 + 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' 50 + substituteInPlace src/CMakeLists.txt \ 51 + --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" 52 + ''; 55 53 56 54 nativeBuildInputs = [ 57 55 cmake ··· 74 72 indilib 75 73 libnova 76 74 exiv2 75 + md4c 77 76 nlopt 78 77 ] 79 78 ++ lib.optionals stdenv.hostPlatform.isLinux [