Unverified Commit e3b18e82 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #226212 from wegank/stellarium-darwin-pre 

stellarium: update darwin patches
parents df04182f b5eaa9ff

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

+18 −4
Original line number Diff line number Diff line
@@ -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[@]}")

  '';

pkgs/development/libraries/science/astronomy/indilib/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -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;

  };

}