Unverified Commit bc63a2f7 authored by Theodore Ni's avatar Theodore Ni Committed by GitHub
Browse files

lapce: unbreak x86_64-darwin (#354566)

parents dcdd61e5 c26249be

pkgs/applications/editors/lapce/default.nix

+50 −51
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, nix-update-script

, rustPlatform

, cmake

, pkg-config

, perl

, python3

, fontconfig

, glib

, gtk3

, openssl

, libGL

, libobjc

, libxkbcommon

, Security

, CoreServices

, ApplicationServices

, Carbon

, AppKit

, wrapGAppsHook3

, wayland

, gobject-introspection

, xorg

{

  lib,

  stdenv,

  fetchFromGitHub,

  nix-update-script,

  rustPlatform,

  cmake,

  pkg-config,

  perl,

  python3,

  fontconfig,

  glib,

  gtk3,

  openssl,

  libGL,

  libobjc,

  libxkbcommon,

  wrapGAppsHook3,

  wayland,

  gobject-introspection,

  xorg,

  apple-sdk_11,

}:

let

  rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -85,29 +82,33 @@ rustPlatform.buildRustPackage rec { 
    gobject-introspection

  ];



  buildInputs = rpathLibs ++ [

  buildInputs =

    rpathLibs

    ++ [

      glib

      gtk3

      openssl

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      fontconfig

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      libobjc

    Security

    CoreServices

    ApplicationServices

    Carbon

    AppKit

      apple-sdk_11

    ];



  postInstall = if stdenv.hostPlatform.isLinux then ''

  postInstall =

    if stdenv.hostPlatform.isLinux then

      ''

        install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg

        install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop



        $STRIP -S $out/bin/lapce



        patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce

  '' else ''

      ''

    else

      ''

        mkdir $out/Applications

        cp -r extra/macos/Lapce.app $out/Applications

        ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS
@@ -124,7 +125,5 @@ rustPlatform.buildRustPackage rec { 
    license = with licenses; [ asl20 ];

    maintainers = with maintainers; [ elliot ];

    mainProgram = "lapce";

    # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL"

    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;

  };

}

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -2598,7 +2598,6 @@ with pkgs; 














  lapce = callPackage ../applications/editors/lapce {















    inherit (darwin) libobjc;













    inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;















  };





























  languagetool-rust = callPackage ../tools/text/languagetool-rust {