From 472f197978224bb542a0cab0b0503f456be27504 Mon Sep 17 00:00:00 2001 From: Christian Kögler Date: Sat, 8 Oct 2022 21:39:01 +0200 Subject: neovide: remove dependency to skia sources --- pkgs/applications/editors/neovim/neovide/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 77f0735ec989d..3d1aa9cdc57c7 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -27,6 +27,7 @@ , ApplicationServices , AppKit , Carbon +, removeReferencesTo }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia + removeReferencesTo ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; # All tests passes but at the end cargo prints for unknown reason: @@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec { xorg.libXi ] ++ lib.optionals enableWayland [ wayland ]); in '' + # library skia embeds the path to its sources + remove-references-to -t "$SKIA_SOURCE_DIR" \ + $out/bin/neovide + wrapProgram $out/bin/neovide \ --prefix LD_LIBRARY_PATH : ${libPath} ''; @@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/applications assets/neovide.desktop ''; + disallowedReferences = [ SKIA_SOURCE_DIR ]; + meta = with lib; { description = "This is a simple graphical user interface for Neovim."; homepage = "https://github.com/Kethku/neovide"; -- cgit 1.4.1