From 83ed2b7e9a05a26e71a878793b8ca3a3e6212fef Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 15 Apr 2023 03:10:21 +0300 Subject: [PATCH 1/2] indilib: add aarch64-darwin support --- .../libraries/science/astronomy/indilib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 194a9a0c15cf..cf722af9cbe1 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.linux; + platforms = platforms.unix; + # error: use of undeclared identifier 'MSG_NOSIGNAL' + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From b5eaa9ffd98d3dad25a1b60858bd2fbd68587a08 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 15 Apr 2023 02:15:35 +0300 Subject: [PATCH 2/2] stellarium: update darwin patches --- .../science/astronomy/stellarium/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index c3880b0b1d2b..2b8d292eada0 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0="; }; + postPatch = lib.optionalString stdenv.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/" + ''; + nativeBuildInputs = [ cmake perl @@ -44,22 +52,28 @@ stdenv.mkDerivation rec { qtmultimedia qtserialport qttranslations - qtwayland qtwebengine calcmysky qxlsx indilib libnova + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; preConfigure = lib.optionalString stdenv.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")' + export LC_ALL=en_US.UTF-8 ''; + # fatal error: 'QtSerialPort/QSerialPortInfo' file not found + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib"; + dontWrapGApps = true; + postInstall = lib.optionalString stdenv.isDarwin '' + makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium + ''; + preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") '';