diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
| commit | fc25d940101161034ac357c48a5912b413fa75cc (patch) | |
| tree | 8d704fee8fa5137952e12e19d74e683ce1fea729 /pkgs/applications/editors | |
| parent | 54a42ab84624e64ad5a1f34daa9559d148970f95 (diff) | |
| parent | 1cab3e231b41f38f2d2cbf5617eb7b88e433428a (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/jupyter-client/default.nix pkgs/development/python-modules/jupyterlab-git/default.nix
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/neovide/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index a40ff76eea34c..c2a696cd425b2 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -17,6 +17,8 @@ , makeFontsConf , libglvnd , libxkbcommon +, stdenv +, enableWayland ? stdenv.isLinux , wayland , xorg }: @@ -96,9 +98,18 @@ rustPlatform.buildRustPackage rec { })) ]; - postFixup = '' + postFixup = let + libPath = lib.makeLibraryPath ([ + libglvnd + libxkbcommon + xorg.libXcursor + xorg.libXext + xorg.libXrandr + xorg.libXi + ] ++ lib.optionals enableWayland [ wayland ]); + in '' wrapProgram $out/bin/neovide \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon wayland xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]} + --prefix LD_LIBRARY_PATH : ${libPath} ''; postInstall = '' @@ -115,7 +126,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "neovide"; }; } |